X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMSP430.py;h=4d84a441df9ab0e111cd8e52312bcd8d54743311;hp=4d54fd9fa363d34c937ca978cd0db4b201189bfe;hb=0a6754712a364a01d149dc518f44b258a3a37cf8;hpb=77f92cbfc76eae4789133d07704a4e216f0f8cd7

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 4d54fd9..4d84a44 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -5,13 +5,17 @@
 #
 # 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):
+    #Set APP to be MSP430APP or MSP430X2APP, the latter being preferred.
+    
+    #0x16 for class, 0x17 for SBW, 0x11 by default
     APP=0x11;
-    MSP430APP=0x11;  #Changed by inheritors.
+    MSP430APP=0x11;    
+    
     CoreID=0;
     DeviceID=0;
     JTAGID=0;
@@ -25,12 +29,12 @@ 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 Device ID."""
+        """Get the Device ID. (MSP430X2 only?)"""
         self.writecmd(self.MSP430APP,0xF1);
         DeviceID=(
             ord(self.data[0])+(ord(self.data[1])<<8)+
@@ -38,17 +42,20 @@ class GoodFETMSP430(GoodFET):
         return DeviceID;
     def peek16(self,adr,memory="vn"):
         return self.MSP430peek(adr);
-    def peek8(self,address, memory="vn"):
+    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 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"""
@@ -66,7 +73,7 @@ class GoodFETMSP430(GoodFET):
         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);
+            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."""
@@ -75,6 +82,12 @@ class GoodFETMSP430(GoodFET):
                    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,
@@ -87,6 +100,11 @@ class GoodFETMSP430(GoodFET):
         """Start debugging."""
         self.writecmd(self.MSP430APP,0x20,0,self.data);
         self.JTAGID=ord(self.data[0]);
+        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;
@@ -135,6 +153,8 @@ class GoodFETMSP430(GoodFET):
         0xf26f: "MSP430F261x",
         0xf237: "MSP430F23x0",
         0xf201: "MSP430F201x",
+        #Are G's and F's distinct?
+        0x2553: "MSP430G2553",
         
         #MSP430F1xx
         0xf16c: "MSP430F161x",
@@ -152,7 +172,7 @@ class GoodFETMSP430(GoodFET):
         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."""
@@ -192,7 +212,8 @@ class GoodFETMSP430(GoodFET):
         
         print "Tests complete, erasing."
         self.MSP430masserase();
-        
+    def erase(self):
+        self.MSP430masserase();
     def MSP430masserase(self):
         """Erase MSP430 flash memory."""
         self.writecmd(self.MSP430APP,0xE3,0,None);
@@ -203,6 +224,14 @@ class GoodFETMSP430(GoodFET):
     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);