Support for sniffing Turning Point Clicker packets.

[goodfet] / client / GoodFETSPI.py

diff --git a/client/GoodFETSPI.py b/client/GoodFETSPI.py
index 044aea2..cab2a37 100644 (file)
--- a/client/GoodFETSPI.py
+++ b/client/GoodFETSPI.py
@@ -25,12 +25,28 @@ class GoodFETSPI(GoodFET):
         self.writecmd(0x01,0x00,len(data),data);
         return self.data;
 
+class GoodFETSPI25C(GoodFETSPI):
+    #opcodes
+    WREN=0x06;
+    WRDI=0x04;
+    RDSR=0x05;
+    WRSR=0x01;
+    READ=0x03;
+    WRITE=0x02;
+    
+    def peek8(self,adr):
+        """Read a byte from the given address."""
+        data=self.SPItrans([self.READ,(adr>>8)&0xFF,adr&0xFF,0x00]);
+        return ord(data[3]);
+
+
 class GoodFETSPIFlash(GoodFETSPI):
     JEDECmanufacturers={0xFF: "MISSING",
                         0xEF: "Winbond",
                         0xC2: "MXIC",
                         0x20: "Numonyx/ST",
-                        0x1F: "Atmel"
+                        0x1F: "Atmel",
+                        0x01: "AMD/Spansion"
                         };
 
     JEDECdevices={0xFFFFFF: "MISSING",
@@ -62,6 +78,7 @@ class GoodFETSPIFlash(GoodFETSPI):
         """Grab an SPI Flash ROM's JEDEC bytes."""
         data=[0x9f, 0, 0, 0];
         data=self.SPItrans(data);
+        
         self.JEDECmanufacturer=ord(data[1]);
         self.JEDECtype=ord(data[2]);
         self.JEDECcapacity=ord(data[3]);
@@ -91,11 +108,13 @@ class GoodFETSPIFlash(GoodFETSPI):
     def SPIpokebyte(self,adr,val):
         self.SPIpokebytes(adr,[val]);
     def SPIpokebytes(self,adr,data):
-        #self.SPIwriteenable();
-        adranddata=[(adr&0xFF0000)>>16,
-              (adr&0xFF00)>>8,
-              adr&0xFF
-              ]+data;
+        #Used to be 24 bits, BE, not 32 bits, LE.
+        adranddata=[adr&0xFF,
+                    (adr&0xFF00)>>8,
+                    (adr&0xFF0000)>>16,
+                    0, #MSB
+                    ]+data;
+        #print "%06x: poking %i bytes" % (adr,len(data));
         self.writecmd(0x01,0x03,
                       len(adranddata),adranddata);