X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.cc;h=7dbb59ac52c4f82011cc50ac000b27d5f353699d;hp=52eb1dddabc8dc4335ff93d5cf1683a06d1d2843;hb=dbd55dca7cded37fc93f74beb7c3043f11389d6e;hpb=c7f111a9f649b3f7c0ce654f5b7ecb07140e438b;ds=sidebyside

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 52eb1dd..7dbb59a 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -38,17 +38,17 @@ client.start();
 
 if(sys.argv[1]=="explore"):
     print "Exploring undefined commands."
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
     
     cmd=0x04; #read status
     for foo in range(0,0x5):
         client.CCcmd([(0x0F<<3)|(0x00)|0x03,0x09<<3]);
-        print "Status %02x: %s" % (foo,client.CCstatusstr());
+        print "Status %02x: %s" % (foo,client.status());
     for foo in range(0,3):
         print "PC: %04x" % client.CCgetPC();
         
 if(sys.argv[1]=="test"):
-    client.CCtest();
+    client.test();
 if(sys.argv[1]=="deadtest"):
     for i in range(1,10):
         print "IDENT as %s" % client.CCidentstr();
@@ -89,11 +89,13 @@ if(sys.argv[1]=="dumpdata"):
         i+=1;
     h.write_hex_file(f);
 if(sys.argv[1]=="status"):
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
+if(sys.argv[1]=="info"):
+    print "%s" % client.CCidentstr();
 if(sys.argv[1]=="erase"):
-    print "Status: %s" % client.CCstatusstr();
+    print "Status: %s" % client.status();
     client.CCchiperase();
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
 
 if(sys.argv[1]=="peekinfo"):
     print "Select info flash."
@@ -148,15 +150,14 @@ if(sys.argv[1]=="flash"):
      page = 0x0000;
      pagelen = client.CCpagesize(); #2048; #2kB pages in 32-bit words
      
+     print "page=%04x, pagelen=%04x" % (page,pagelen);
+     
      bcount = 0;
      
-     print "Wiping Flash."
-     #Wipe all of flash.
-     #client.CCchiperase();
      #Wipe the RAM buffer for the next flash page.
      client.CCeraseflashbuffer();
      for i in h._buf.keys():
-         while(i>page+pagelen):
+         while(i>=page+pagelen):
              if bcount>0:
                  client.CCflashpage(page);
                  #client.CCeraseflashbuffer();
@@ -175,9 +176,9 @@ if(sys.argv[1]=="flash"):
      print "Flashed final page at %06x" % page;
      
 if(sys.argv[1]=="lock"):
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
     client.CClockchip();
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
 if(sys.argv[1]=="flashpage"):
     target=0;
     if(len(sys.argv)>2):