JEDEC size detection.

[goodfet] / client / goodfet.spiflash

diff --git a/client/goodfet.spiflash b/client/goodfet.spiflash
index 354d502..e6150e2 100755 (executable)
--- a/client/goodfet.spiflash
+++ b/client/goodfet.spiflash
@@ -18,15 +18,15 @@ 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();
 
 #Initailize FET and set baud rate
 client=GoodFET();
-client.serInit("/dev/ttyUSB0")
+client.serInit()
 
 
 client.SPIsetup();
@@ -65,7 +65,7 @@ if(sys.argv[1]=="info"):
 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):
@@ -77,9 +77,7 @@ if(sys.argv[1]=="dump"):
     i=start;
     while i<=stop:
         data=client.SPIpeekblock(i);
-        
-        
-        if(i%0x100==0):
+        if(i%0x1000==0):
             print "Dumped %06x."%i;
         for j in data:
             file.write(j);
@@ -88,7 +86,8 @@ if(sys.argv[1]=="dump"):
 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 +108,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()