X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFET.py;h=b9c35e3adc4bad1f12b53103f85d30cadc12aba7;hp=ec1c47034498062aa6e453964e70970e9c23d7b0;hb=ba447ec2175b15e3f9368c6dd18988215b36b84b;hpb=f217c730250832ae74a60b9d494111eac3763fd6 diff --git a/client/GoodFET.py b/client/GoodFET.py index ec1c470..b9c35e3 100755 --- a/client/GoodFET.py +++ b/client/GoodFET.py @@ -11,12 +11,13 @@ import sqlite3; fmt = ("B", " 0: port = glob_list[0]; + else: + port = os.environ.get("GOODFET"); if port is None: glob_list = glob.glob("/dev/tty.usbserial*"); if len(glob_list) > 0: @@ -85,6 +89,14 @@ class GoodFET: glob_list = glob.glob("/dev/ttyUSB*"); if len(glob_list) > 0: port = glob_list[0]; + if os.name=='nt': + from scanwin32 import winScan; + scan=winScan(); + for order,comport,desc,hwid in sorted(scan.comports()): + if hwid.index('FTDI')==0: + port=comport; + #print "Using FTDI port %s" % port + self.serialport = serial.Serial( port, @@ -96,21 +108,33 @@ class GoodFET: self.verb=0; attempts=0; - while self.verb!=0x7F: - self.serialport.flushInput() - self.serialport.flushOutput() - #Explicitly set RTS and DTR to halt board. - self.serialport.setRTS(1); - self.serialport.setDTR(1); - #Drop DTR, which is !RST, low to begin the app. - self.serialport.setDTR(0); - self.serialport.flushInput() - self.serialport.flushOutput() - #time.sleep(.1); - attempts=attempts+1; - self.readcmd(); #Read the first command. - - #print "Connected after %02i attempts." % attempts; + connected=0; + while connected==0: + while self.verb!=0x7F or self.data!="http://goodfet.sf.net/": + #print "Resyncing."; + self.serialport.flushInput() + self.serialport.flushOutput() + #Explicitly set RTS and DTR to halt board. + self.serialport.setRTS(1); + self.serialport.setDTR(1); + #Drop DTR, which is !RST, low to begin the app. + self.serialport.setDTR(0); + self.serialport.flushInput() + self.serialport.flushOutput() + #time.sleep(60); + attempts=attempts+1; + self.readcmd(); #Read the first command. + #Here we have a connection, but maybe not a good one. + connected=1; + olds=self.infostring(); + clocking=self.monitorclocking(); + for foo in range(1,30): + if not self.monitorecho(): + if self.verbose: print "Comm error on %i try, resyncing out of %s." % (foo, + clocking); + connected=0; + break; + if self.verbose: print "Connected after %02i attempts." % attempts; self.mon_connected(); def getbuffer(self,size=0x1c00): @@ -176,9 +200,11 @@ class GoodFET: self.data=self.serialport.read(self.count); return self.data; except TypeError: - print "Error: waiting for serial read timed out (most likely)." - sys.exit(-1) - + if self.connected: + print "Error: waiting for serial read timed out (most likely)."; + print "This shouldn't happen after syncing. Exiting for safety."; + sys.exit(-1) + return self.data; #Glitching stuff. def glitchApp(self,app): """Glitch into a device by its application.""" @@ -223,8 +249,10 @@ class GoodFET: self.besilent=s; print "besilent is %i" % self.besilent; self.writecmd(0,0xB0,1,[s]); + connected=0; def mon_connected(self): """Announce to the monitor that the connection is good.""" + self.connected=1; self.writecmd(0,0xB1,0,[]); def out(self,byte): """Write a byte to P5OUT.""" @@ -249,6 +277,9 @@ class GoodFET: def peekword(self,address): """Read a word of memory from the monitor.""" return self.peekbyte(address)+(self.peekbyte(address+1)<<8); + def peek(self,address): + """Read a word of memory from the monitor.""" + return self.peekbyte(address)+(self.peekbyte(address+1)<<8); def pokebyte(self,address,value): """Set a byte of memory by the monitor.""" self.data=[address&0xff,address>>8,value]; @@ -311,17 +342,32 @@ class GoodFET: def monitortest(self): """Self-test several functions through the monitor.""" print "Performing monitor self-test."; - - if self.peekword(0x0c00)!=0x0c04 and self.peekword(0x0c00)!=0x0c06: - print "ERROR Fetched wrong value from 0x0c04."; - self.pokebyte(0x0021,0); #Drop LED - if self.peekbyte(0x0021)!=0: - print "ERROR, P1OUT not cleared."; - self.pokebyte(0x0021,1); #Light LED - + self.monitorclocking(); + for f in range(0,3000): + a=self.peekword(0x0c00); + b=self.peekword(0x0c02); + if a!=0x0c04 and a!=0x0c06: + print "ERROR Fetched %04x, %04x" % (a,b); + self.pokebyte(0x0021,0); #Drop LED + if self.peekbyte(0x0021)!=0: + print "ERROR, P1OUT not cleared."; + self.pokebyte(0x0021,1); #Light LED + if not self.monitorecho(): + print "Echo test failed."; print "Self-test complete."; - - + self.monitorclocking(); + def monitorecho(self): + data="The quick brown fox jumped over the lazy dog."; + self.writecmd(self.MONITORAPP,0x81,len(data),data); + if self.data!=data: + if self.verbose: print "Comm error recognized by monitorecho()."; + return 0; + return 1; + def monitorclocking(self): + DCOCTL=self.peekbyte(0x0056); + BCSCTL1=self.peekbyte(0x0057); + return "0x%02x, 0x%02x" % (DCOCTL, BCSCTL1); + # The following functions ought to be implemented in # every client. @@ -358,7 +404,6 @@ class GoodFET: def dump(self,file,start=0,stop=0xffff): """Dump an intel hex file from code memory.""" print "Dump not implemented."; - def peek32(self,address, memory="vn"): return (self.peek16(address,memory)+ (self.peek16(address+2,memory)<<16)); @@ -367,5 +412,8 @@ class GoodFET: (self.peek8(address+1,memory)<<8)); def peek8(self,address, memory="vn"): return self.peekbyte(address); #monitor + def peekword(self,address, memory="vn"): + return self.peek(address); #monitor + def loadsymbols(self): return;