X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.cc;h=445f3583aff8559ca791fccc580a12b437d9f446;hp=27941a701a09e3cb0492049dcd81323b3c80dc1b;hb=9e13b1450d770a5645468221d0eacc1533d654a9;hpb=2578d3d26d4b79f281f46ca36faf6d0c67edbace

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 27941a7..445f358 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -4,57 +4,75 @@ import sys;
 import binascii;
 
 from GoodFET import GoodFET;
-from intelhex import IntelHex16bit;
+from intelhex import 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 info" % sys.argv[0];
+    print "%s dumpcode $foo.hex [0x$start 0x$stop]" % sys.argv[0];
+    print "%s dumpdata $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 writedata $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s verify $foo.hex [0x$start 0x$stop]" % sys.argv[0];
+    print "%s peekdata 0x$start [0x$stop]" % sys.argv[0];
+    print "%s pokedata 0x$adr 0x$val" % sys.argv[0];
+    #print "%s peekcode 0x$start [0x$stop]" % sys.argv[0];
     sys.exit();
 
 #Initailize FET and set baud rate
 client=GoodFET();
 client.serInit("/dev/ttyUSB0")
 
-
-
 #Connect to target
 client.CCsetup();
 client.CCstart();
 
-#client.setBaud(2);
-
-if(sys.argv[1]=="monitortest"):
-    client.monitortest();
 if(sys.argv[1]=="test"):
     client.CCtest();
-if(sys.argv[1]=="dump"):
+if(sys.argv[1]=="dumpcode"):
+    f = sys.argv[2];
+    start=0x0000;
+    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 code from %04x to %04x as %s." % (start,stop,f);
+    h = IntelHex(None);
+    i=start;
+    while i<=stop:
+        h[i>>1]=client.CCpeekcodebyte(i);
+        if(i%0x100==0):
+            print "Dumped %04x."%i;
+        i+=1;
+    h.write_hex_file(f);
+if(sys.argv[1]=="dumpdata"):
     f = sys.argv[2];
-    start=0x0200;
+    start=0xE000;
     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);
+    print "Dumping data from %04x to %04x as %s." % (start,stop,f);
+    h = IntelHex(None);
     i=start;
-    while i<stop:
-        h[i>>1]=client.MSP430peek(i);
+    while i<=stop:
+        h[i]=client.CCpeekdatabyte(i);
         if(i%0x100==0):
             print "Dumped %04x."%i;
-        i+=2;
+        i+=1;
     h.write_hex_file(f);
 if(sys.argv[1]=="erase"):
-    client.MSP430masserase();
-if(sys.argv[1]=="ivt"):
-    client.MSP430dumpmem(0xFFE0,0xFFFF);
+  print "Status: %s" % client.CCstatusstr();
+  client.CCchiperase();
+  print "Status: %s" %client.CCstatusstr();
+
 if(sys.argv[1]=="flash"):
     f=sys.argv[2];
     start=0;
@@ -64,18 +82,34 @@ if(sys.argv[1]=="flash"):
     if(len(sys.argv)>4):
         stop=int(sys.argv[4],16);
     
-    h = IntelHex16bit(f);
+    h = IntelHex(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):
+        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]=="writedata"):
+    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 = IntelHex(f);
+    
+    for i in h._buf.keys():
+        if(i>=start and i<=stop):
+            client.CCpokedatabyte(i,h[i]);
+            if(i%0x100==0):
+                print "%04x" % i;
 if(sys.argv[1]=="flashtest"):
     client.MSP430flashtest();
-if(sys.argv[1]=="verify"):
+if(sys.argv[1]=="verifycode"):
     f=sys.argv[2];
     start=0;
     stop=0xFFFF;
@@ -84,15 +118,33 @@ if(sys.argv[1]=="verify"):
     if(len(sys.argv)>4):
         stop=int(sys.argv[4],16);
     
-    h = IntelHex16bit(f);
+    h = IntelHex(f);
     for i in h._buf.keys():
-        if(i>=start and i<stop and i&1==0):
+        if(i>=start and i<=stop):
             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]=="peekdata"):
+    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: %02x" % (start,client.CCpeekdatabyte(start));
+        start=start+1;
+if(sys.argv[1]=="pokedata"):
+    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 %04x to become %02x." % (start,val);
+    client.CCpokedatabyte(start,val);
 
-
-#client.MSP430releasecpu();
-#client.MSP430stop();
+client.CCstop();