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

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 7ad26d2..4ee6e4f 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -39,16 +39,16 @@ class GoodFETMSP430(GoodFET):
         """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,1);
+                   ];
+        self.writecmd(self.MSP430APP,0x02,4,self.data);
+        
         return ord(self.data[0])+(ord(self.data[1])<<8);
-    def MSP430peekblock(self,adr,blocks=1):
+    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,
-              blocks];
-        
-        self.writecmd(self.MSP430APP,0x02,5,data,blocks);
+              0x00,0x04];
+        self.writecmd(self.MSP430APP,0x02,6,data);
         return self.data;
     
     def MSP430poke(self,adr,val):
@@ -116,6 +116,8 @@ class GoodFETMSP430(GoodFET):
         0xf213: "MSP430F21x1",
         0xf249: "MSP430F24x",
         0xf26f: "MSP430F261x",
+        0xf237: "MSP430F23x0",
+        
         
         #MSP430F1xx
         0xf16c: "MSP430F161x",
@@ -137,28 +139,43 @@ class GoodFETMSP430(GoodFET):
         }
     def MSP430test(self):
         """Test MSP430 JTAG.  Requires that a chip be attached."""
+        
         if self.MSP430ident()==0xffff:
-            print "Is anything connected?";
-        print "Testing RAM from 1c00 to 1d00.";
-        for a in range(0x1c00,0x1d00):
+            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 "RAM Test Complete."
-        for a in range(1,5):
-            print "Identity %04x" % self.MSP430ident();
-            
-    def MSP430flashtest(self):
+                
+        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();
-        i=0x2500;
-        while(i<0xFFFF):
-            if(self.MSP430peek(i)!=0xFFFF):
-                print "ERROR: Unerased flash at %04x."%i;
-            self.MSP430writeflash(i,0xDEAD);
-            i+=2;
+        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 MSP430masserase(self):
         """Erase MSP430 flash memory."""
         self.writecmd(self.MSP430APP,0xE3,0,None);