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

diff --git a/client/goodfet.spiflash b/client/goodfet.spiflash
index b7cec4b..dcdc68b 100755
--- a/client/goodfet.spiflash
+++ b/client/goodfet.spiflash
@@ -111,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()
 
@@ -135,14 +140,12 @@ 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());
-    
-    #N.B., chunksize must be an even fraction of 0x100.
-    #Increasing above 0x200 doesn't help, 0x100 might be good enough.
-    chunksize=0x200;
+    chunksize=0x100;
     
     while i<=stop:
         bytes=range(0,chunksize);