spliflash writing command is 'flash', not 'write'.

[goodfet] / client / goodfet.cc

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 445f358..3b97280 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -7,7 +7,6 @@ from GoodFET import GoodFET;
 from intelhex import IntelHex;
 
 
-
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s test" % sys.argv[0];
@@ -24,7 +23,7 @@ if(len(sys.argv)==1):
 
 #Initailize FET and set baud rate
 client=GoodFET();
-client.serInit("/dev/ttyUSB0")
+client.serInit()
 
 #Connect to target
 client.CCsetup();
@@ -73,24 +72,24 @@ if(sys.argv[1]=="erase"):
   client.CCchiperase();
   print "Status: %s" %client.CCstatusstr();
 
-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);
+# 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 = IntelHex(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):
-            client.MSP430writeflash(i,h[i>>1]);
-            if(i%0x100==0):
-                print "%04x" % i;
+#     client.CCchiperase();
+#     for i in h._buf.keys():
+#         #print "%04x: %04x"%(i,h[i>>1]);
+#         if(i>=start and i<=stop  and i&1==0):
+#             client.CCwriteflash(i,h[i>>1]);
+#             if(i%0x100==0):
+#                 print "%04x" % i;
 if(sys.argv[1]=="writedata"):
     f=sys.argv[2];
     start=0;
@@ -107,25 +106,8 @@ if(sys.argv[1]=="writedata"):
             client.CCpokedatabyte(i,h[i]);
             if(i%0x100==0):
                 print "%04x" % i;
-if(sys.argv[1]=="flashtest"):
-    client.MSP430flashtest();
-if(sys.argv[1]=="verifycode"):
-    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):
-            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]=="flashtest"):
+#    client.CCflashtest();
 if(sys.argv[1]=="peekdata"):
     start=0x0000;
     if(len(sys.argv)>2):
@@ -137,6 +119,17 @@ if(sys.argv[1]=="peekdata"):
     while start<=stop:
         print "%04x: %02x" % (start,client.CCpeekdatabyte(start));
         start=start+1;
+if(sys.argv[1]=="peekcode"):
+    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.CCpeekcodebyte(start));
+        start=start+1;
 if(sys.argv[1]=="pokedata"):
     start=0x0000;
     val=0x00;