X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.msp430;h=f616fba4b6e7c729424937c63a717095ca7ee43b;hp=368cb0f098de5a989394130b74b54b4635401172;hb=f4a6b415e762bcdc560f3ea655851d16f483ea5a;hpb=32f20cd81c67f9cfb9bd11b9b62942ff60d9b2f4

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index 368cb0f..f616fba 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -4,7 +4,7 @@ import sys;
 import binascii;
 
 from GoodFETMSP430 import GoodFETMSP430;
-from intelhex import IntelHex16bit;
+from intelhex import IntelHex16bit, IntelHex;
 
 
 
@@ -23,14 +23,20 @@ client.serInit()
 
 #Connect to target
 client.MSP430setup();
+#print "setup"
 
 #Identify model number.
 client.MSP430start();
+client.MSP430haltcpu();
+#print "started"
 
 if(sys.argv[1]=="info"):
-    print "Model    %04x " % client.MSP430coreid();
-    print "Core %08x " % client.MSP430deviceid();
-    print "Identity %04x" % client.MSP430ident();
+    #print "Model    %08x " % client.MSP430deviceid();
+    #print "Core     %04x " % client.MSP430coreid();
+    #print "Identity %04x" % client.MSP430ident();
+    print "Identifies as %s (%04x)" % (
+        client.MSP430identstr(),
+        client.MSP430ident());
 if(sys.argv[1]=="test"):
     client.MSP430test();
 if(sys.argv[1]=="dump"):
@@ -43,13 +49,15 @@ if(sys.argv[1]=="dump"):
         stop=int(sys.argv[4],16);
     
     print "Dumping from %04x to %04x as %s." % (start,stop,f);
-    h = IntelHex16bit(None);
+    #h = IntelHex16bit(None);
+    h = IntelHex(None);
     i=start;
-    while i<stop:
-        h[i>>1]=client.MSP430peek(i);
-        if(i%0x100==0):
-            print "Dumped %04x."%i;
-        i+=2;
+    while i<=stop:
+        data=client.MSP430peekblock(i);
+        print "Dumped %06x."%i;
+        for j in data:
+            if i<=stop: h[i]=ord(j);
+            i+=1;
     h.write_hex_file(f);
 if(sys.argv[1]=="erase"):
     client.MSP430masserase();
@@ -70,11 +78,13 @@ if(sys.argv[1]=="flash"):
     for i in h._buf.keys():
         #print "%04x: %04x"%(i,h[i>>1]);
         if(i>=start and i<stop  and i&1==0):
-            client.MSP430writeflash(i,h[i>>1]);
+            val=h[i>>1];
+            val2=client.MSP430pokeflash(i,val);
+            if(val!=val2):
+                print "Write error at %04x, %04x!=%04x." %(
+                    i, val, val2);
             if(i%0x100==0):
                 print "%04x" % i;
-if(sys.argv[1]=="flashtest"):
-    client.MSP430flashtest();
 if(sys.argv[1]=="verify"):
     f=sys.argv[2];
     start=0;
@@ -103,6 +113,7 @@ if(sys.argv[1]=="peek"):
     while start<=stop:
         print "%04x: %04x" % (start,client.MSP430peek(start));
         start=start+2;
+
 if(sys.argv[1]=="poke"):
     start=0x0000;
     val=0x00;
@@ -110,10 +121,10 @@ if(sys.argv[1]=="poke"):
         start=int(sys.argv[2],16);
     if(len(sys.argv)>3):
         val=int(sys.argv[3],16);
-    print "Poking %06x to become %02x." % (start,val);
+    print "Poking %06x to become %04x." % (start,val);
     
     while client.MSP430peek(start)!=val:
-        client.MSP430poke(start,val);
+        client.MSP430pokeflash(start,val);
         print "Poked to %04x" % client.MSP430peek(start);