X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=client%2FGoodFET.py;h=cbcf1c4ad963cb7fe31f2269d06d21311d93da20;hb=9db7b366db7bd2535064bcdb0ae0ea89b2e6988f;hp=f2a673b124166acc7d74602cc3d1ca5d0cec3a23;hpb=4cf3fdb6a6d9a8844481d661e4d4c957c6a2ec87;p=goodfet

diff --git a/client/GoodFET.py b/client/GoodFET.py
index f2a673b..cbcf1c4 100755
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -153,20 +153,21 @@ class GoodFET:
         
         self.writecmd(0x01,0x02,3,data);
         return self.data;
+    
     def SPIpokebyte(self,adr,val):
-        self.SPIwriteenable();
-        data=[0x02,
-              (adr&0xFF0000)>>16,
+        self.SPIpokebytes(adr,[val]);
+    def SPIpokebytes(self,adr,data):
+        #self.SPIwriteenable();
+        adranddata=[(adr&0xFF0000)>>16,
               (adr&0xFF00)>>8,
-              adr&0xFF,
-              val];
-        self.SPItrans(data);
+              adr&0xFF
+              ]+data;
+        self.writecmd(0x01,0x03,
+                      len(adranddata),adranddata);
+        
     def SPIchiperase(self):
         """Mass erase an SPI Flash ROM."""
-        self.SPIwriteenable();
-        #Chip Erase
-        data=[0xC7];
-        self.SPItrans(data);
+        self.writecmd(0x01,0x81,0,[]);
     def SPIwriteenable(self):
         """SPI Flash Write Enable"""
         data=[0x06];