X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.spiflash;h=7aa287d1f6cf9e2bd52aa061964152479bafbd27;hp=354d5025444ee52f790b6377600fc0ab758b4e8f;hb=fbf1dcfd59f6213926c78178115c1b7110afdf8f;hpb=c6e02600ef0e12eb9a7309755740a23b71a62205

diff --git a/client/goodfet.spiflash b/client/goodfet.spiflash
index 354d502..7aa287d 100755
--- a/client/goodfet.spiflash
+++ b/client/goodfet.spiflash
@@ -10,7 +10,7 @@ import sys;
 import binascii;
 import array;
 
-from GoodFET import GoodFET;
+from GoodFETSPI import GoodFETSPIFlash;
 from intelhex import IntelHex;
 
 if(len(sys.argv)==1):
@@ -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 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")
+#Initialize FET and set baud rate
+client=GoodFETSPIFlash();
+client.serInit()
 
 
 client.SPIsetup();
@@ -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):
@@ -73,22 +74,48 @@ if(sys.argv[1]=="dump"):
     
     print "Dumping code from %06x to %06x as %s." % (start,stop,f);
     file = open(f, mode='wb')
+    
+    i=start;
+    while i<=stop:
+        data=client.SPIpeekblock(i,255);
+        #if(i%0x1000==0):
+        print "Dumped %06x."%i;
+        for j in data:
+            if i<stop: file.write(j);
+            i+=1;
+    file.close()
 
+if(sys.argv[1]=="verify"):
+    f = sys.argv[2];
+    start=0x0000;
+    stop=client.JEDECsize;
+    if(len(sys.argv)>3):
+        start=int(sys.argv[3],16);
+    if(len(sys.argv)>4):
+        stop=int(sys.argv[4],16);
+    
+    print "Verifying code from %06x to %06x as %s." % (start,stop,f);
+    file = open(f, mode='rb')
+    
     i=start;
+    bits=0;
     while i<=stop:
-        data=client.SPIpeekblock(i);
-        
-        
-        if(i%0x100==0):
-            print "Dumped %06x."%i;
+        data=client.SPIpeekblock(i,255);
+        print "Verified %06x." % i;
         for j in data:
-            file.write(j);
+            if i<stop:
+                bits|=ord(file.read(1))^ord(j);
             i+=1;
+        if bits!=0:
+            print "Bits don't match."
+
     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 +136,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()