X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.msp430;h=c5413c5d742e8707f91daa386336490fdaea1280;hp=d012728e7cd651c13eb185187f1b2be771d9b6e1;hb=598bfb091e51a8d5b7e463bd834203d677d99977;hpb=1c58df5f46dc4550684ed9227732e880d2023791

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index d012728..c5413c5 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -7,7 +7,6 @@ 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];
@@ -15,6 +14,9 @@ if(len(sys.argv)==1):
     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];
+    print "%s poke 0x$adr 0x$val" % sys.argv[0];
+    print "%s peek 0x$start [0x$stop]" % sys.argv[0];
+    print "%s run" % sys.argv[0];
     sys.exit();
 
 #Initialize FET and set baud rate
@@ -22,12 +24,12 @@ client=GoodFETMSP430();
 client.serInit()
 
 #Connect to target
-client.MSP430setup();
+client.setup();
 #print "setup"
 
 #Identify model number.
-client.MSP430start();
-client.MSP430haltcpu();
+client.start();
+
 #print "started"
 
 if(sys.argv[1]=="info"):
@@ -77,17 +79,37 @@ if(sys.argv[1]=="flash"):
     
     h = IntelHex16bit(f);
     
+    #Should this be default?
+    #Makes flashing multiple images inconvenient.
     client.MSP430masserase();
+    
+    count=0; #Bytes in commit.
+    first=0;
+    vals=[];
+    last=0;  #Last address committed.
     for i in h._buf.keys():
-        #print "%04x: %04x"%(i,h[i>>1]);
+        if((count>0x40 or last+2!=i) and count>0 and i&1==0):
+            #print "%i, %x, %x" % (len(vals), last, i);
+            client.MSP430pokeflashblock(first,vals);
+            count=0;
+            first=0;
+            last=0;
+            vals=[];
         if(i>=start and i<stop  and i&1==0):
             val=h[i>>1];
-            val2=client.MSP430pokeflash(i,val);
-            if(val!=val2):
-                print "Write error at %04x, %04x!=%04x." %(
-                    i, val, val2);
+            if(count==0):
+                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;
+    if count>0: #last commit, ivt
+        client.MSP430pokeflashblock(first,vals);
 if(sys.argv[1]=="verify"):
     f=sys.argv[2];
     start=0;
@@ -131,10 +153,15 @@ if(sys.argv[1]=="poke"):
         print "Poked to %04x" % client.MSP430peek(start);
 
 
+if(sys.argv[1]=="run"):
+    #Set PC to RESET vector's value.
+    #client.MSP430setPC(client.MSP430peek(0xfffe));
+    #client.MSP430releasecpu();
+    client.MSP430run();
 
 if(sys.argv[1]=="whatever"):
     for i in [0x24FF, 0x2500, 0x2502, 0x2504]:
         print "%04x" % client.MSP430peek(i);
 
-client.MSP430releasecpu();
-client.MSP430stop();
+#client.MSP430releasecpu();
+#client.MSP430stop();