X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMSP430.py;h=ac9ab74aeb10470f01416d87cb9641506207952e;hp=4ee6e4f138657f4d15c436ca0c4587eac89b2c45;hb=d4d64ee399117d1fead5f15d0f70aec7a4ea9398;hpb=f4a6b415e762bcdc560f3ea655851d16f483ea5a

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 4ee6e4f..ac9ab74 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -10,12 +10,13 @@ import sys, time, string, cStringIO, struct, glob, serial, os;
 from GoodFET import GoodFET;
 
 class GoodFETMSP430(GoodFET):
+    APP=0x11;
     MSP430APP=0x11;  #Changed by inheritors.
     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);
         
@@ -29,12 +30,18 @@ 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)+
             (ord(self.data[2])<<16)+(ord(self.data[3])<<24));
         return DeviceID;
+    def peek16(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,
@@ -57,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,
@@ -65,15 +75,27 @@ 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 MSP430start(self):
+    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." % self.JTAGID;
         if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
-            print "Error, misidentified as %02x." % self.JTAGID;
+            #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);
@@ -117,15 +139,15 @@ class GoodFETMSP430(GoodFET):
         0xf249: "MSP430F24x",
         0xf26f: "MSP430F261x",
         0xf237: "MSP430F23x0",
-        
+        0xf201: "MSP430F201x",
         
         #MSP430F1xx
         0xf16c: "MSP430F161x",
-        0xf149: "MSP430F13x", #or f14x(1)
-        0xf112: "MSP430F11x", #or f11x1
+        0xf149: "MSP430F13x",  #or f14x(1)
+        0xf112: "MSP430F11x",  #or f11x1
         0xf143: "MSP430F14x",
-        0xf112: "MSP430F11x", #or F11x1A
-        0xf123: "MSP430F1xx", #or F123x
+        0xf112: "MSP430F11x",  #or F11x1A
+        0xf123: "MSP430F1xx",  #or F123x
         0x1132: "MSP430F1122", #or F1132
         0x1232: "MSP430F1222", #or F1232
         0xf169: "MSP430F16x",
@@ -179,7 +201,24 @@ 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);
     def MSP430dumpbsl(self):
         self.MSP430dumpmem(0xC00,0xfff);
     def MSP430dumpallmem(self):