updated features for two different types of sniffing. fixed and scrolling. This can...
[goodfet] / client / GoodFETMSP430.py
index 22b7ee8..4d84a44 100644 (file)
@@ -5,17 +5,22 @@
 #
 # Presently being rewritten.
 
-import sys, time, string, cStringIO, struct, glob, serial, os;
+import sys, time, string, cStringIO, struct, glob, os;
 
 from GoodFET import GoodFET;
 
 class GoodFETMSP430(GoodFET):
-    MSP430APP=0x11;  #Changed by inheritors.
+    #Set APP to be MSP430APP or MSP430X2APP, the latter being preferred.
+    
+    #0x16 for class, 0x17 for SBW, 0x11 by default
+    APP=0x11;
+    MSP430APP=0x11;    
+    
     CoreID=0;
     DeviceID=0;
     JTAGID=0;
     MSP430ident=0;
-    def MSP430setup(self):
+    def setup(self):
         """Move the FET into the MSP430 JTAG application."""
         self.writecmd(self.MSP430APP,0x10,0,None);
         
@@ -24,37 +29,86 @@ class GoodFETMSP430(GoodFET):
         self.writecmd(self.MSP430APP,0x21,0,self.data);
     
     def MSP430coreid(self):
-        """Get the Core ID."""
+        """Get the Core ID. (MSP430X2 only?)"""
         self.writecmd(self.MSP430APP,0xF0);
         CoreID=ord(self.data[0])+(ord(self.data[1])<<8);
         return CoreID;
     def MSP430deviceid(self):
-        """Get the Core ID."""
+        """Get the Device ID. (MSP430X2 only?)"""
         self.writecmd(self.MSP430APP,0xF1);
         DeviceID=(
             ord(self.data[0])+(ord(self.data[1])<<8)+
             (ord(self.data[2])<<16)+(ord(self.data[3])<<24));
         return DeviceID;
+    def peek16(self,adr,memory="vn"):
+        return self.MSP430peek(adr);
+    def peek(self,adr,memory="vn"):
+        return self.MSP430peek(adr);
+    def peek8(self,adr, memory="vn"):
+        adr=self.MSP430peek(adr&~1);
+        if adr&1==0: return adr&0xFF;
+        else: return adr>>8;
+
     def MSP430peek(self,adr):
-        """Read the contents of memory at an address."""
-        self.data=[adr&0xff, (adr&0xff00)>>8];
-        self.writecmd(self.MSP430APP,0x02,2,self.data);
+        """Read a word at an address."""
+        self.data=[adr&0xff, (adr&0xff00)>>8,
+                   (adr&0xff0000)>>16,(adr&0xff000000)>>24,
+                   ];
+        self.writecmd(self.MSP430APP,0x02,4,self.data);
+        #print "Got %i bytes peeking 0x%04x." % (len(self.data),adr);
         return ord(self.data[0])+(ord(self.data[1])<<8);
+    def MSP430peekblock(self,adr):
+        """Grab a few block from an SPI Flash ROM.  Block size is unknown"""
+        data=[adr&0xff, (adr&0xff00)>>8,
+              (adr&0xff0000)>>16,(adr&0xff000000)>>24,
+              0x00,0x04];
+        self.writecmd(self.MSP430APP,0x02,6,data);
+        return self.data;
+    
     def MSP430poke(self,adr,val):
-        """Read the contents of memory at an address."""
-        self.data=[adr&0xff, (adr&0xff00)>>8, val&0xff, (val&0xff00)>>8];
-        self.writecmd(self.MSP430APP,0x03,4,self.data);
-        return;# ord(self.data[0])+(ord(self.data[1])<<8);
-    def MSP430start(self):
+        """Write the contents of memory at an address."""
+        self.data=[adr&0xff, (adr&0xff00)>>8,
+                   (adr&0xff0000)>>16,(adr&0xff000000)>>24,
+                   val&0xff, (val&0xff00)>>8];
+        self.writecmd(self.MSP430APP,0x03,6,self.data);
+        written=ord(self.data[0])+(ord(self.data[1])<<8);
+        if(written!=val):
+            print "Failed to write 0x%04x to 0x%04x" % (val,adr);
+        return written;
+    def MSP430pokeflash(self,adr,val):
+        """Write the contents of flash memory at an address."""
+        self.data=[adr&0xff, (adr&0xff00)>>8,
+                   (adr&0xff0000)>>16,(adr&0xff000000)>>24,
+                   val&0xff, (val&0xff00)>>8];
+        self.writecmd(self.MSP430APP,0xE1,6,self.data);
+        return ord(self.data[0])+(ord(self.data[1])<<8);
+    def setsecret(self,value):
+        """Set a secret word for later retreival.  Used by glitcher."""
+        self.MSP430pokeflash(0xFFFE,value);
+    def getsecret(self):
+        """Get a secret word.  Used by glitcher."""
+        return self.peek(0xfffe);
+    def MSP430pokeflashblock(self,adr,data):
+        """Write many words to flash memory at an address."""
+        self.data=[adr&0xff, (adr&0xff00)>>8,
+                   (adr&0xff0000)>>16,(adr&0xff000000)>>24]+data;
+        #print "Writing %i bytes to %x" % (len(data),adr);
+        #print "%2x %2x %2x %2x ..." % (data[0], data[1], data[2], data[3]);
+        self.writecmd(self.MSP430APP,0xE1,len(self.data),self.data);
+        return ord(self.data[0])+(ord(self.data[1])<<8);
+    def start(self):
         """Start debugging."""
         self.writecmd(self.MSP430APP,0x20,0,self.data);
         self.JTAGID=ord(self.data[0]);
-        #print "Identified as %02x." % id;
-        if(self.JTAGID==0x89 or self.JTAGID==0x91):
-            print "Successfully connected."
-        else:
-            print "Error, misidentified as %02x." % id;
-    
+        if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
+            #Try once more
+            self.writecmd(self.MSP430APP,0x20,0,self.data);
+            self.JTAGID=ord(self.data[0]);
+        
+        #print "Identified as %02x." % self.JTAGID;
+        if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
+            print "Error, misidentified as %02x.\nCheck wiring, as this should be 0x89 or 0x91." % self.JTAGID;
+        self.MSP430haltcpu();
     def MSP430haltcpu(self):
         """Halt the CPU."""
         self.writecmd(self.MSP430APP,0xA0,0,self.data);
@@ -77,45 +131,110 @@ class GoodFETMSP430(GoodFET):
         return self.data[0];
     def MSP430ident(self):
         """Grab self-identification word from 0x0FF0 as big endian."""
+        ident=0x00;
         if(self.JTAGID==0x89):
             i=self.MSP430peek(0x0ff0);
             ident=((i&0xFF00)>>8)+((i&0xFF)<<8)
+            
         if(self.JTAGID==0x91):
             i=self.MSP430peek(0x1A04);
             ident=((i&0xFF00)>>8)+((i&0xFF)<<8)
+            #ident=0x0091;
+        
         return ident;
+    def MSP430identstr(self):
+        """Grab model string."""
+        return self.MSP430devices.get(self.MSP430ident());
+    MSP430devices={
+        #MSP430F2xx
+        0xf227: "MSP430F22xx",
+        0xf213: "MSP430F21x1",
+        0xf249: "MSP430F24x",
+        0xf26f: "MSP430F261x",
+        0xf237: "MSP430F23x0",
+        0xf201: "MSP430F201x",
+        #Are G's and F's distinct?
+        0x2553: "MSP430G2553",
+        
+        #MSP430F1xx
+        0xf16c: "MSP430F161x",
+        0xf149: "MSP430F13x",  #or f14x(1)
+        0xf112: "MSP430F11x",  #or f11x1
+        0xf143: "MSP430F14x",
+        0xf112: "MSP430F11x",  #or F11x1A
+        0xf123: "MSP430F1xx",  #or F123x
+        0x1132: "MSP430F1122", #or F1132
+        0x1232: "MSP430F1222", #or F1232
+        0xf169: "MSP430F16x",
+        
+        #MSP430F4xx
+        0xF449: "MSP430F43x", #or F44x
+        0xF427: "MSP430FE42x", #or FW42x, F415, F417
+        0xF439: "MSP430FG43x",
+        0xf46f: "MSP430FG46xx", #or F471xx
+        0xF413: "MSP430F413", #or maybe others.
+        }
     def MSP430test(self):
         """Test MSP430 JTAG.  Requires that a chip be attached."""
+        
         if self.MSP430ident()==0xffff:
-            print "Is anything connected?";
-        print "Testing RAM.";
-        temp=self.MSP430peek(0x0200);
-        self.MSP430poke(0x0200,0xdead);
-        if(self.MSP430peek(0x0200)!=0xdead):
-            print "Poke of 0x0200 did not set to 0xDEAD properly.";
-            return;
-        self.MSP430poke(0x0200,temp); #restore old value.
-    def MSP430flashtest(self):
+            print "ERROR Is anything connected?";
+        print "Testing %s." % self.MSP430identstr();
+        print "Testing RAM from 200 to 210.";
+        for a in range(0x200,0x210):
+            self.MSP430poke(a,0);
+            if(self.MSP430peek(a)!=0):
+                print "Fault at %06x" % a;
+            self.MSP430poke(a,0xffff);
+            if(self.MSP430peek(a)!=0xffff):
+                print "Fault at %06x" % a;
+                
+        print "Testing identity consistency."
+        ident=self.MSP430ident();
+        for a in range(1,20):
+            ident2=self.MSP430ident();
+            if ident!=ident2:
+                print "Identity %04x!=%04x" % (ident,ident2);
+        
+        print "Testing flash erase."
+        self.MSP430masserase();
+        for a in range(0xffe0, 0xffff):
+            if self.MSP430peek(a)!=0xffff:
+                print "%04x unerased, equals %04x" % (
+                    a, self.MSP430peek(a));
+
+        print "Testing flash write."
+        for a in range(0xffe0, 0xffff):
+            self.MSP430pokeflash(a,0xbeef);
+            if self.MSP430peek(a)!=0xbeef:
+                print "%04x unset, equals %04x" % (
+                    a, self.MSP430peek(a));
+        
+        print "Tests complete, erasing."
+        self.MSP430masserase();
+    def erase(self):
         self.MSP430masserase();
-        i=0x2500;
-        while(i<0xFFFF):
-            if(self.MSP430peek(i)!=0xFFFF):
-                print "ERROR: Unerased flash at %04x."%i;
-            self.MSP430writeflash(i,0xDEAD);
-            i+=2;
     def MSP430masserase(self):
         """Erase MSP430 flash memory."""
         self.writecmd(self.MSP430APP,0xE3,0,None);
-    def MSP430writeflash(self,adr,val):
-        """Write a word of flash memory."""
-        if(self.MSP430peek(adr)!=0xFFFF):
-            print "FLASH ERROR: %04x not clear." % adr;
-        data=[adr&0xFF,(adr&0xFF00)>>8,val&0xFF,(val&0xFF00)>>8];
-        self.writecmd(self.MSP430APP,0xE1,4,data);
-        rval=ord(self.data[0])+(ord(self.data[1])<<8);
-        if(val!=rval):
-            print "FLASH WRITE ERROR AT %04x.  Found %04x, wrote %04x." % (adr,rval,val);
-        
+    def MSP430infoerase(self):
+        """Erase MSP430 info flash."""
+        self.writecmd(self.MSP430APP,0xE8,0,None);
+
+    def MSP430setPC(self, pc):
+        """Set the program counter."""
+        self.writecmd(self.MSP430APP,0xC2,2,[pc&0xFF,(pc>>8)&0xFF]);
+    def MSP430setreg(self,reg,val):
+        """Set a register."""
+        self.writecmd(self.MSP430APP,0xD2,3,[reg,val&0xFF,(val>>8)&0xFF]);
+    def MSP430getreg(self,reg):
+        """Get a register."""
+        self.writecmd(self.MSP430APP,0xD3,1,[reg]);
+        return ord(self.data[0])+(ord(self.data[1])<<8);
+
+    def MSP430run(self):
+        """Reset the MSP430 to run on its own."""
+        self.writecmd(self.MSP430APP,0x21,0,None);
     def MSP430dumpbsl(self):
         self.MSP430dumpmem(0xC00,0xfff);
     def MSP430dumpallmem(self):