X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.msp430;h=f204081f15e1ecdf4721c86c671f475d58363c78;hp=be13da6aa5c3625e7820a2f031c424def9bf8485;hb=dd259c9289deb11e84be93647c144192e5ba10b6;hpb=ece5c9e0f1fa967a118de9e59ce4b2981aaf132f

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index be13da6..f204081 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -7,15 +7,16 @@ from GoodFETMSP430 import GoodFETMSP430;
 from intelhex import IntelHex16bit, IntelHex;
 
 
-
 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 eraseinfo" % 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];
     print "%s poke 0x$adr 0x$val" % sys.argv[0];
+    print "%s serial [$val]" % sys.argv[0];
     print "%s peek 0x$start [0x$stop]" % sys.argv[0];
     print "%s run" % sys.argv[0];
     sys.exit();
@@ -25,13 +26,11 @@ client=GoodFETMSP430();
 client.serInit()
 
 #Connect to target
-client.MSP430setup();
+client.setup();
 #print "setup"
 
 #Identify model number.
-client.MSP430start();
-client.MSP430haltcpu();
-#print "started"
+client.start();
 
 if(sys.argv[1]=="info"):
     #print "Model    %08x " % client.MSP430deviceid();
@@ -66,13 +65,19 @@ if(sys.argv[1]=="dump"):
             i+=1;
     h.write_hex_file(f);
 if(sys.argv[1]=="erase"):
+    print "Erasing main flash memory."
     client.MSP430masserase();
+if(sys.argv[1]=="eraseinfo"):
+    print "Erasing info memory."
+    client.MSP430infoerase();
+
+
 if(sys.argv[1]=="ivt"):
     client.MSP430dumpmem(0xFFE0,0xFFFF);
 if(sys.argv[1]=="flash"):
     f=sys.argv[2];
     start=0;
-    stop=0xFFFF;
+    stop=0x10000;
     if(len(sys.argv)>3):
         start=int(sys.argv[3],16);
     if(len(sys.argv)>4):
@@ -82,7 +87,7 @@ if(sys.argv[1]=="flash"):
     
     #Should this be default?
     #Makes flashing multiple images inconvenient.
-    client.MSP430masserase();
+    #client.MSP430masserase();
     
     count=0; #Bytes in commit.
     first=0;
@@ -102,10 +107,6 @@ if(sys.argv[1]=="flash"):
                 first=i;
             last=i;
             count+=2;
-            #val2=client.MSP430pokeflash(i,val);
-            #if(val!=val2):
-            #    print "Write error at %04x, %04x!=%04x." %(
-            #        i, val, val2);
             vals+=[val&0xff,(val&0xff00)>>8];
             if(i%0x100==0):
                 print "%04x" % i;
@@ -149,10 +150,25 @@ if(sys.argv[1]=="poke"):
         val=int(sys.argv[3],16);
     print "Poking %06x to become %04x." % (start,val);
     
-    while client.MSP430peek(start)!=val:
-        client.MSP430pokeflash(start,val);
+    while client.MSP430peek(start)&(~val)>0:
+        client.MSP430pokeflashblock(start,[val&0xFF, (val>>8)&0xFF]);
         print "Poked to %04x" % client.MSP430peek(start);
-
+if(sys.argv[1]=="serial"):
+    oid=0xdeadbeef;
+    if(len(sys.argv)>2):
+        oid=eval(sys.argv[2]);
+    else:
+        simpchin=u=unichr(24207)+unichr(21015)+unichr(21495)
+        print simpchin;
+        oid=input(u"Serial Number? ");
+    adr=0xFFB0;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    if(len(sys.argv)>3):
+        val=int(sys.argv[3],16);
+    print "Poking 32-bit OID to 0x%04x as %08x." % (adr,oid);
+    client.MSP430pokeflash(adr,oid&0xFFFF);
+    client.MSP430pokeflash(adr+2,(oid>>16)&0xFFFF);
 
 if(sys.argv[1]=="run"):
     #Set PC to RESET vector's value.