JEDEC size detection.

[goodfet] / client / GoodFET.py

diff --git a/client/GoodFET.py b/client/GoodFET.py
index 8d588ed..99756ba 100755 (executable)
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -6,17 +6,21 @@
 # This code is ugly as sin, for bootstrapping the firmware only.
 # Rewrite cleanly as soon as is convenient.
 
 # This code is ugly as sin, for bootstrapping the firmware only.
 # Rewrite cleanly as soon as is convenient.
 

-import sys, time, string, cStringIO, struct, glob, serial
+import sys, time, string, cStringIO, struct, glob, serial, os;

 
 
 class GoodFET:
     def __init__(self, *args, **kargs):
         self.data=[0];
     def timeout(self):
 
 
 class GoodFET:
     def __init__(self, *args, **kargs):
         self.data=[0];
     def timeout(self):

-        print "timout\n";
+        print "timeout\n";

     def serInit(self, port=None):
         """Open the serial port"""
         
     def serInit(self, port=None):
         """Open the serial port"""
         

+        if port is None:
+            glob_list = glob.glob(os.environ.get("GOODFET"));
+            if len(glob_list) > 0:
+                port = glob_list[0];

         if port is None:
             glob_list = glob.glob("/dev/tty.usbserial*");
             if len(glob_list) > 0:
         if port is None:
             glob_list = glob.glob("/dev/tty.usbserial*");
             if len(glob_list) > 0:


@@ -41,8 +45,8 @@ class GoodFET:
         #time.sleep(1);
         self.readcmd(); #Read the first command.
         if(self.verb!=0x7F):
         #time.sleep(1);
         self.readcmd(); #Read the first command.
         if(self.verb!=0x7F):

-            print "Verb is wrong.  Incorrect firmware?";
-        
+            print "Verb %02x is wrong.  Incorrect firmware?" % self.verb;
+        #print "Connected."

     def writecmd(self, app, verb, count, data):
         """Write a command and some data to the GoodFET."""
         self.serialport.write(chr(app));
     def writecmd(self, app, verb, count, data):
         """Write a command and some data to the GoodFET."""
         self.serialport.write(chr(app));


@@ -90,8 +94,17 @@ class GoodFET:
         """Determine how many bytes of RAM are unused by looking for 0xBEEF.."""
         self.writecmd(0,0x91,0,self.data);
         return ord(self.data[0])+(ord(self.data[1])<<8);
         """Determine how many bytes of RAM are unused by looking for 0xBEEF.."""
         self.writecmd(0,0x91,0,self.data);
         return ord(self.data[0])+(ord(self.data[1])<<8);

+    
+    #Baud rates.
+    baudrates=[115200, 
+               9600,
+               19200,
+               38400,
+               57600,
+               115200];

     def setBaud(self,baud):
     def setBaud(self,baud):

-        rates=[9600, 9600, 19200, 38400];
+        """Change the baud rate.  TODO fix this."""
+        rates=self.baudrates;

         self.data=[baud];
         print "Changing FET baud."
         self.serialport.write(chr(0x00));
         self.data=[baud];
         print "Changing FET baud."
         self.serialport.write(chr(0x00));


@@ -107,11 +120,26 @@ class GoodFET:
         
         print "Baud is now %i." % rates[baud];
         return;
         
         print "Baud is now %i." % rates[baud];
         return;

+    def readbyte(self):
+        return ord(self.serialport.read(1));
+    def findbaud(self):
+        for r in self.baudrates:
+            print "\nTrying %i" % r;
+            self.serialport.setBaudrate(r);
+            #time.sleep(1);
+            self.serialport.flushInput()
+            self.serialport.flushOutput()
+            
+            for i in range(1,10):
+                self.readbyte();
+            
+            print "Read %02x %02x %02x %02x" % (
+                self.readbyte(),self.readbyte(),self.readbyte(),self.readbyte());

     def monitortest(self):
         """Self-test several functions through the monitor."""
         print "Performing monitor self-test.";
         
     def monitortest(self):
         """Self-test several functions through the monitor."""
         print "Performing monitor self-test.";
         

-        if self.peekword(0x0c00)!=0x0c04:
+        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 Fetched wrong value from 0x0c04.";
         self.pokebyte(0x0021,0); #Drop LED
         if self.peekbyte(0x0021)!=0:


@@ -123,6 +151,7 @@ class GoodFET:
     def SPIsetup(self):
         """Moved the FET into the SPI application."""
         self.writecmd(0x01,0x10,0,self.data); #SPI/SETUP
     def SPIsetup(self):
         """Moved the FET into the SPI application."""
         self.writecmd(0x01,0x10,0,self.data); #SPI/SETUP

+    

         
     def SPItrans8(self,byte):
         """Read and write 8 bits by SPI."""
         
     def SPItrans8(self,byte):
         """Read and write 8 bits by SPI."""


@@ -150,6 +179,11 @@ class GoodFET:
                   0xC22013: "MX25L4005",
                   0x204011: "M45PE10"
                   };
                   0xC22013: "MX25L4005",
                   0x204011: "M45PE10"
                   };

+    JEDECsizes={0x14: 0x100000,
+                0x13: 0x080000,
+                0x12: 0x040000,
+                0x11: 0x020000}
+    JEDECsize=0;

     def SPIjedec(self):
         """Grab an SPI Flash ROM's JEDEC bytes."""
         data=[0x9f, 0, 0, 0];
     def SPIjedec(self):
         """Grab an SPI Flash ROM's JEDEC bytes."""
         data=[0x9f, 0, 0, 0];


@@ -158,6 +192,7 @@ class GoodFET:
         self.JEDECmanufacturer=ord(data[1]);
         self.JEDECtype=ord(data[2]);
         self.JEDECcapacity=ord(data[3]);
         self.JEDECmanufacturer=ord(data[1]);
         self.JEDECtype=ord(data[2]);
         self.JEDECcapacity=ord(data[3]);

+        self.JEDECsize=self.JEDECsizes.get(self.JEDECcapacity);

         self.JEDECdevice=(ord(data[1])<<16)+(ord(data[2])<<8)+ord(data[3]);
         return data;
     def SPIpeek(self,adr):
         self.JEDECdevice=(ord(data[1])<<16)+(ord(data[2])<<8)+ord(data[3]);
         return data;
     def SPIpeek(self,adr):


@@ -170,14 +205,13 @@ class GoodFET:
         self.SPItrans(data);
         return ord(self.data[4]);
     def SPIpeekblock(self,adr):
         self.SPItrans(data);
         return ord(self.data[4]);
     def SPIpeekblock(self,adr):

-        """Grab a byte from an SPI Flash ROM."""
+        """Grab a block from an SPI Flash ROM.  Block size is unknown"""

         data=[(adr&0xFF0000)>>16,
               (adr&0xFF00)>>8,
               adr&0xFF];
         
         self.writecmd(0x01,0x02,3,data);
         return self.data;
         data=[(adr&0xFF0000)>>16,
               (adr&0xFF00)>>8,
               adr&0xFF];
         
         self.writecmd(0x01,0x02,3,data);
         return self.data;

-    

     def SPIpokebyte(self,adr,val):
         self.SPIpokebytes(adr,[val]);
     def SPIpokebytes(self,adr,data):
     def SPIpokebyte(self,adr,val):
         self.SPIpokebytes(adr,[val]);
     def SPIpokebytes(self,adr,data):


@@ -218,11 +252,26 @@ class GoodFET:
         print "Initializing MSP430.";
         self.writecmd(0x11,0x10,0,self.data);
 
         print "Initializing MSP430.";
         self.writecmd(0x11,0x10,0,self.data);
 

-    
-    
+    def I2Csetup(self):
+        """Move the FET into the I2C application."""
+        self.writecmd(0x02,0x10,0,self.data); #SPI/SETUP
+    def I2Cstart(self):
+        """Start an I2C transaction."""
+        self.writecmd(0x02,0x20,0,self.data); #SPI/SETUP
+    def I2Cstop(self):
+        """Stop an I2C transaction."""
+        self.writecmd(0x02,0x21,0,self.data); #SPI/SETUP
+    def I2Cread(self,len=1):
+        """Read len bytes by I2C."""
+        self.writecmd(0x02,0x00,1,[len]); #SPI/SETUP
+        return self.data;
+    def I2Cwrite(self,bytes):
+        """Write bytes by I2C."""
+        self.writecmd(0x02,0x01,len(bytes),bytes); #SPI/SETUP
+        return ord(self.data[0]);

     def CCsetup(self):
         """Move the FET into the CC2430/CC2530 application."""
     def CCsetup(self):
         """Move the FET into the CC2430/CC2530 application."""

-        print "Initializing Chipcon.";
+        #print "Initializing Chipcon.";

         self.writecmd(0x30,0x10,0,self.data);
     def CCrd_config(self):
         """Read the config register of a Chipcon."""
         self.writecmd(0x30,0x10,0,self.data);
     def CCrd_config(self):
         """Read the config register of a Chipcon."""


@@ -321,7 +370,7 @@ class GoodFET:
         #print "Status: %s." % self.CCstatusstr();
         self.CCreleasecpu();
         self.CChaltcpu();
         #print "Status: %s." % self.CCstatusstr();
         self.CCreleasecpu();
         self.CChaltcpu();

-        print "Status: %s." % self.CCstatusstr();
+        #print "Status: %s." % self.CCstatusstr();

         
     def CCstop(self):
         """Stop debugging."""
         
     def CCstop(self):
         """Stop debugging."""


@@ -406,7 +455,7 @@ class GoodFET:
     def CCtest(self):
         self.CCreleasecpu();
         self.CChaltcpu();
     def CCtest(self):
         self.CCreleasecpu();
         self.CChaltcpu();

-        print "Status: %s" % self.CCstatusstr();
+        #print "Status: %s" % self.CCstatusstr();

         
         #Grab ident three times, should be equal.
         ident1=self.CCident();
         
         #Grab ident three times, should be equal.
         ident1=self.CCident();


@@ -417,26 +466,22 @@ class GoodFET:
             print "%04x, %04x, %04x" % (ident1, ident2, ident3);
         
         #Single step, printing PC.
             print "%04x, %04x, %04x" % (ident1, ident2, ident3);
         
         #Single step, printing PC.

-        #print "Tracing execution at startup."
+        print "Tracing execution at startup."

         for i in range(1,15):
             pc=self.CCgetPC();
             byte=self.CCpeekcodebyte(i);
         for i in range(1,15):
             pc=self.CCgetPC();
             byte=self.CCpeekcodebyte(i);

-            print "PC=%04x, %02x" % (pc, byte);
+            #print "PC=%04x, %02x" % (pc, byte);

             self.CCstep_instr();
         
             self.CCstep_instr();
         

-        #print "Verifying that debugging a NOP doesn't affect the PC."
+        print "Verifying that debugging a NOP doesn't affect the PC."

         for i in range(1,15):
             pc=self.CCgetPC();
             self.CCdebuginstr([0x00]);
             if(pc!=self.CCgetPC()):
                 print "ERROR: PC changed during CCdebuginstr([NOP])!";
         for i in range(1,15):
             pc=self.CCgetPC();
             self.CCdebuginstr([0x00]);
             if(pc!=self.CCgetPC()):
                 print "ERROR: PC changed during CCdebuginstr([NOP])!";

-        for i in range(0xE500,0xE600):
-            byte=self.CCpeekdatabyte(i);
-            print "data %04x: %02x" % (i,byte);
-            self.CCpokedatabyte(i,i&0xFF);
-            byte=self.CCpeekdatabyte(i);
-            print "data %04x: %02x" % (i,byte);
-        print "Status: %s." % self.CCstatusstr();
+        
+        
+        #print "Status: %s." % self.CCstatusstr();

         #Exit debugger
         self.CCstop();
         print "Done.";
         #Exit debugger
         self.CCstop();
         print "Done.";