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

diff --git a/client/goodfet.spiflash b/client/goodfet.spiflash
index e6150e2..571ddc4 100755
--- a/client/goodfet.spiflash
+++ b/client/goodfet.spiflash
@@ -56,11 +56,12 @@ 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];
@@ -76,11 +77,11 @@ if(sys.argv[1]=="dump"):
 
     i=start;
     while i<=stop:
-        data=client.SPIpeekblock(i);
-        if(i%0x1000==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"):