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

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index c2d70f1..368cb0f 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -3,23 +3,34 @@
 import sys;
 import binascii;
 
-from GoodFET import GoodFET;
+from GoodFETMSP430 import GoodFETMSP430;
 from intelhex import IntelHex16bit;
 
 
-client=GoodFET();
-client.serInit("/dev/ttyUSB0")
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s test" % sys.argv[0];
     print "%s dump $foo.hex [0x$start 0x$stop]" % sys.argv[0];
+    print "%s erase" % sys.argv[0];
+    print "%s flash $foo.hex [0x$start 0x$stop]" % sys.argv[0];
+    print "%s verify $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     sys.exit();
 
+#Initialize FET and set baud rate
+client=GoodFETMSP430();
+client.serInit()
+
 #Connect to target
 client.MSP430setup();
+
+#Identify model number.
 client.MSP430start();
 
+if(sys.argv[1]=="info"):
+    print "Model    %04x " % client.MSP430coreid();
+    print "Core %08x " % client.MSP430deviceid();
+    print "Identity %04x" % client.MSP430ident();
 if(sys.argv[1]=="test"):
     client.MSP430test();
 if(sys.argv[1]=="dump"):
@@ -35,11 +46,81 @@ if(sys.argv[1]=="dump"):
     h = IntelHex16bit(None);
     i=start;
     while i<stop:
-        #print "%04x %04x" % (i, client.MSP430peek(i));
         h[i>>1]=client.MSP430peek(i);
         if(i%0x100==0):
             print "Dumped %04x."%i;
         i+=2;
-    #h.dump();#(tofile=f);
     h.write_hex_file(f);
+if(sys.argv[1]=="erase"):
+    client.MSP430masserase();
+if(sys.argv[1]=="ivt"):
+    client.MSP430dumpmem(0xFFE0,0xFFFF);
+if(sys.argv[1]=="flash"):
+    f=sys.argv[2];
+    start=0;
+    stop=0xFFFF;
+    if(len(sys.argv)>3):
+        start=int(sys.argv[3],16);
+    if(len(sys.argv)>4):
+        stop=int(sys.argv[4],16);
+    
+    h = IntelHex16bit(f);
+    
+    client.MSP430masserase();
+    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]);
+            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;
+    stop=0xFFFF;
+    if(len(sys.argv)>3):
+        start=int(sys.argv[3],16);
+    if(len(sys.argv)>4):
+        stop=int(sys.argv[4],16);
+    
+    h = IntelHex16bit(f);
+    for i in h._buf.keys():
+        if(i>=start and i<stop and i&1==0):
+            peek=client.MSP430peek(i)
+            if(h[i>>1]!=peek):
+                print "ERROR at %04x, found %04x not %04x"%(i,peek,h[i>>1]);
+            if(i%0x100==0):
+                print "%04x" % i;
+if(sys.argv[1]=="peek"):
+    start=0x0000;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    stop=start;
+    if(len(sys.argv)>3):
+        stop=int(sys.argv[3],16);
+    print "Peeking from %04x to %04x." % (start,stop);
+    while start<=stop:
+        print "%04x: %04x" % (start,client.MSP430peek(start));
+        start=start+2;
+if(sys.argv[1]=="poke"):
+    start=0x0000;
+    val=0x00;
+    if(len(sys.argv)>2):
+        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);
+    
+    while client.MSP430peek(start)!=val:
+        client.MSP430poke(start,val);
+        print "Poked to %04x" % client.MSP430peek(start);
+
+
+
+if(sys.argv[1]=="whatever"):
+    for i in [0x24FF, 0x2500, 0x2502, 0x2504]:
+        print "%04x" % client.MSP430peek(i);
+
+client.MSP430releasecpu();
 client.MSP430stop();