Moved the MSP430 client to its own file, preparing for MSP430X2 (5xx) support.

[goodfet] / client / goodfet.msp430

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index 8a17a26..d961c77 100755 (executable)
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -1,17 +1,99 @@
 #!/usr/bin/env python
 
-from GoodFET import GoodFET;
+import sys;
+import binascii;
 
+from GoodFETMSP430 import GoodFETMSP430;
+from intelhex import IntelHex16bit;
 
-client=GoodFET();
-client.serInit("/dev/ttyUSB0")
 
-client.MSP430test();
-#client.MSP430dumpbsl();
 
-# client.MSP430setup();
-# client.MSP430start();
-# client.MSP430haltcpu();
-# ident=client.MSP430peek(0x0ff0);
-# print "Target identifies as %04x." % ident;
+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();
 
+#Initailize FET and set baud rate
+client=GoodFETMSP430();
+client.serInit()
+
+#Connect to target
+client.MSP430setup();
+client.MSP430start();
+
+#client.setBaud(2);
+
+if(sys.argv[1]=="monitortest"):
+    client.monitortest();
+if(sys.argv[1]=="test"):
+    client.MSP430test();
+if(sys.argv[1]=="dump"):
+    f = sys.argv[2];
+    start=0x0200;
+    stop=0xFFFF;
+    if(len(sys.argv)>3):
+        start=int(sys.argv[3],16);
+    if(len(sys.argv)>4):
+        stop=int(sys.argv[4],16);
+    
+    print "Dumping from %04x to %04x as %s." % (start,stop,f);
+    h = IntelHex16bit(None);
+    i=start;
+    while i<stop:
+        h[i>>1]=client.MSP430peek(i);
+        if(i%0x100==0):
+            print "Dumped %04x."%i;
+        i+=2;
+    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]=="whatever"):
+    for i in [0x24FF, 0x2500, 0x2502, 0x2504]:
+        print "%04x" % client.MSP430peek(i);
+
+client.MSP430releasecpu();
+client.MSP430stop();