X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.spiflash;h=571ddc43ff78a479cdd0bb1574b6d782b18d7231;hp=c2bc60b9010c1556a4ab93bfd3e7f001665170b7;hb=c5f9be41f72eaddb734b78396ee4bf7bd6273439;hpb=8f05454eedc506a9b46c2b8bce9af2480089827f

diff --git a/client/goodfet.spiflash b/client/goodfet.spiflash
index c2bc60b..571ddc4 100755
--- a/client/goodfet.spiflash
+++ b/client/goodfet.spiflash
@@ -18,8 +18,8 @@ if(len(sys.argv)==1):
     print "%s info" % sys.argv[0];
     print "%s dump $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s erase" % sys.argv[0];
-    print "%s write $foo.hex [0x$start 0x$stop]" % sys.argv[0];
-    print "%s verify $foo.hex [0x$start 0x$stop]" % 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 peek 0x$start [0x$stop]" % sys.argv[0];
     print "%s poke 0x$adr 0x$val" % sys.argv[0];
     sys.exit();
@@ -56,16 +56,17 @@ if(sys.argv[1]=="test"):
 
 if(sys.argv[1]=="info"):
     data=client.SPIjedec();
-    print "Ident as %s\nManufacturer: %02x %s\nType: %02x\nCapacity: %02x" % (
+    print "Ident as %s\nManufacturer: %02x %s\nType: %02x\nCapacity: %02x (%i bytes)" % (
         client.SPIjedecstr(),
         ord(data[1]),client.SPIjedecmanstr(),
         ord(data[2]),
-        ord(data[3]));
+        ord(data[3]),
+        client.JEDECsize);
 
 if(sys.argv[1]=="dump"):
     f = sys.argv[2];
     start=0x0000;
-    stop=0x100000; #TODO, adjust this by the JEDEC size parameter.
+    stop=client.JEDECsize;
     if(len(sys.argv)>3):
         start=int(sys.argv[3],16);
     if(len(sys.argv)>4):
@@ -76,19 +77,18 @@ if(sys.argv[1]=="dump"):
 
     i=start;
     while i<=stop:
-        data=client.SPIpeekblock(i);
-        
-        
-        if(i%0x100==0):
-            print "Dumped %06x."%i;
+        data=client.SPIpeekblock(i,255);
+        #if(i%0x1000==0):
+        print "Dumped %06x."%i;
         for j in data:
-            file.write(j);
+            if i<stop: file.write(j);
             i+=1;
     file.close()
 if(sys.argv[1]=="flash"):
     f = sys.argv[2];
     start=0x0000;
-    stop=0x100000; #TODO, adjust this by the JEDEC size parameter.
+    stop=client.JEDECsize;
+    
     if(len(sys.argv)>3):
         start=int(sys.argv[3],16);
     if(len(sys.argv)>4):
@@ -109,7 +109,7 @@ if(sys.argv[1]=="flash"):
         client.SPIpokebytes(i,bytes);
         
         i+=chunksize;
-        if(i%0x100==0):
+        if(i%0x1000==0):
             print "Flashed %06x."%i;
     file.close()