X-Git-Url: http://git.rot13.org//?a=blobdiff_plain;f=client%2Fgoodfet.spiflash;h=b7cec4bc688cdfbb891d3429993412b5d4e50499;hb=78f4f21969789bec27a8e2957eb00a87d8756041;hp=7a187db434ae0c1c0715dcbf921187c2e243a97e;hpb=a07ee5d1ce0e6c0f5e53a04afed88a96b323177a;p=goodfet

diff --git a/client/goodfet.spiflash b/client/goodfet.spiflash
index 7a187db..b7cec4b 100755
--- a/client/goodfet.spiflash
+++ b/client/goodfet.spiflash
@@ -16,10 +16,10 @@ 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:
@@ -126,7 +139,10 @@ if(sys.argv[1]=="flash"):
 
     i=start;
     chars=list(file.read());
-    chunksize=0xfc;
+    
+    #N.B., chunksize must be an even fraction of 0x100.
+    #Increasing above 0x200 doesn't help, 0x100 might be good enough.
+    chunksize=0x200;
     
     while i<=stop:
         bytes=range(0,chunksize);
@@ -137,6 +153,8 @@ if(sys.argv[1]=="flash"):
         i+=chunksize;
         if(i%0x1000==0):
             print "Flashed %06x."%i;
+    
+    
     file.close()