X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMSP430.py;h=ef9c64d6a8b8b3c0ccaa4f5777f745727ff6e696;hp=671bccd0779fd70e93b623dfd48f59f97ff42a89;hb=1898be2b9e4666be17c4be54560ae8afa7623c7c;hpb=fb68ba63f3c3a28a60ecde196a094edfc917bf91

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 671bccd..ef9c64d 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -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,
@@ -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);