X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMSP430.py;h=ef9c64d6a8b8b3c0ccaa4f5777f745727ff6e696;hp=bb20bfe2906e6cfa5d4d0b40357df36e4fd61fd3;hb=b7a6e00b7d75a7f29401c2aeeb2e19cbd622d678;hpb=0176d144154fc807d65ba0e9276ccdc2e86dd039

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index bb20bfe..ef9c64d 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -30,7 +30,7 @@ class GoodFETMSP430(GoodFET):
         CoreID=ord(self.data[0])+(ord(self.data[1])<<8);
         return CoreID;
     def MSP430deviceid(self):
-        """Get the Core ID."""
+        """Get the Device ID."""
         self.writecmd(self.MSP430APP,0xF1);
         DeviceID=(
             ord(self.data[0])+(ord(self.data[1])<<8)+
@@ -38,7 +38,7 @@ class GoodFETMSP430(GoodFET):
         return DeviceID;
     def peek16(self,adr,memory="vn"):
         return self.MSP430peek(adr);
-    def peek8(self,address, memory="vn"):
+    def peek8(self,adr, memory="vn"):
         adr=self.MSP430peek(adr&~1);
         if adr&1==0: return adr&0xFF;
         else: return adr>>8;
@@ -64,7 +64,10 @@ class GoodFETMSP430(GoodFET):
                    (adr&0xff0000)>>16,(adr&0xff000000)>>24,
                    val&0xff, (val&0xff00)>>8];
         self.writecmd(self.MSP430APP,0x03,6,self.data);
-        return ord(self.data[0])+(ord(self.data[1])<<8);
+        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,
@@ -86,7 +89,7 @@ class GoodFETMSP430(GoodFET):
         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." % self.JTAGID;
+            print "Error, misidentified as %02x.\nCheck wiring, as this should be 0x89 or 0x91." % self.JTAGID;
         self.MSP430haltcpu();
     def MSP430haltcpu(self):
         """Halt the CPU."""
@@ -193,9 +196,21 @@ class GoodFETMSP430(GoodFET):
     def MSP430masserase(self):
         """Erase MSP430 flash memory."""
         self.writecmd(self.MSP430APP,0xE3,0,None);
+    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);