X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.spiflash;h=dcdc68be9ab4fa486c2143dfb631b67b5dbf6e98;hp=c47c4dc22679022e9fa7ad2ff9fa2c0e13aab758;hb=d08bfd3c7cdc687fd68ba9025702c262665e52d3;hpb=fa7c4f1b34ed53c88a678f947eb4b34c6e9807b4

diff --git a/client/goodfet.spiflash b/client/goodfet.spiflash
index c47c4dc..dcdc68b 100755
--- a/client/goodfet.spiflash
+++ b/client/goodfet.spiflash
@@ -10,16 +10,16 @@ import sys;
 import binascii;
 import array;
 
-from GoodFET import GoodFETSPIFlash;
+from GoodFETSPI import GoodFETSPIFlash;
 from intelhex import IntelHex;
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s info" % sys.argv[0];
-    print "%s dump $foo.hex [0x$start 0x$stop]" % sys.argv[0];
+    print "%s dump $foo.rom [0x$start 0x$stop]" % sys.argv[0];
     print "%s erase" % 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 flash $foo.rom [0x$start 0x$stop]" % sys.argv[0];
+    print "%s verify $foo.rom [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();
@@ -53,7 +53,20 @@ if(sys.argv[1]=="test"):
         print "Some success, some failures.  Is a wire loose?";
     else:
         print "All reads succeeded.  Wiring is probably good.";
-
+    print "Erasing.";
+    client.SPIchiperase();
+    print "Testing erase.";
+    data=client.SPIpeekblock(0);
+    for i in data:
+        if ord(i)!=0xFF:
+            print "ERROR not properly erased!";
+    data=range(0,10);
+    client.SPIpokebytes(0,data);
+    print "Testing flash write.";
+    for i in data:
+        if(client.SPIpeek(i)!=i):
+            print "%06x not properly poked to %02x" % (i,i);
+    print "Test complete.";
 if(sys.argv[1]=="info"):
     data=client.SPIjedec();
     print "Ident as %s\nManufacturer: %02x %s\nType: %02x\nCapacity: %02x (%i bytes)" % (
@@ -77,7 +90,7 @@ if(sys.argv[1]=="dump"):
     
     i=start;
     while i<=stop:
-        data=client.SPIpeekblock(i,255);
+        data=client.SPIpeekblock(i);
         #if(i%0x1000==0):
         print "Dumped %06x."%i;
         for j in data:
@@ -98,16 +111,21 @@ if(sys.argv[1]=="verify"):
     file = open(f, mode='rb')
     
     i=start;
-    bits=0;
+    bytes=0;
     while i<=stop:
-        data=client.SPIpeekblock(i,255);
+        data=client.SPIpeekblock(i);
         print "Verified %06x." % i;
         for j in data:
             if i<stop:
-                bits|=ord(file.read(1))^ord(j);
+                #bits|=ord(file.read(1))^ord(j);
+                a=ord(file.read(1));
+                b=ord(j);
+                if a!=b:
+                    print "%06x: %02x/%02x" % (i,a,b);
+                    bytes+=1;
             i+=1;
-        if bits!=0:
-            print "Bits don't match."
+        if bytes!=0:
+            print "%i bytes don't match." % bytes
 
     file.close()
 
@@ -122,22 +140,24 @@ if(sys.argv[1]=="flash"):
         stop=int(sys.argv[4],16);
     
     print "Flashing code from %06x to %06x with %s." % (start,stop,f);
+    print "FIXME This might fail if the file is of an odd size.";
     file = open(f, mode='rb')
 
     i=start;
     chars=list(file.read());
-    chunksize=0x80;
+    chunksize=0x100;
     
     while i<=stop:
         bytes=range(0,chunksize);
         for j in range(0,chunksize):
             bytes[j]=ord(chars[i+j]);
-        #client.SPIpokebyte(i,ord(chars[i]));
         client.SPIpokebytes(i,bytes);
         
         i+=chunksize;
         if(i%0x1000==0):
             print "Flashed %06x."%i;
+    
+    
     file.close()