X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETSPI.py;h=6c8f504afe38b98f254e8dd4fd136c9e83c63917;hp=0020ec2012b4b27a2334017af39796238ffc66f1;hb=105419853423fb0f37ac30db8d730ec9ab4f3cd9;hpb=039a62c63ef19f44880a77451d0aa7c21fddc041

diff --git a/client/GoodFETSPI.py b/client/GoodFETSPI.py
index 0020ec2..6c8f504 100644
--- a/client/GoodFETSPI.py
+++ b/client/GoodFETSPI.py
@@ -25,6 +25,21 @@ 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,memory="vn"):
+        """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",
@@ -45,7 +60,8 @@ class GoodFETSPIFlash(GoodFETSPI):
                   0xC22015: "MX25L1605D",
                   0xC22014: "MX25L8005",
                   0xC22013: "MX25L4005",
-                  0x204011: "M45PE10"
+                  0x204011: "M45PE10",
+                  0x1f4501: "AT24DF081",
                   };
     
     JEDECsizes={0x17: 0x800000,
@@ -70,7 +86,10 @@ class GoodFETSPIFlash(GoodFETSPI):
         self.JEDECsize=self.JEDECsizes.get(self.JEDECcapacity);
         if self.JEDECsize==None:
             self.JEDECsize=0;
-        self.JEDECdevice=(ord(data[1])<<16)+(ord(data[2])<<8)+ord(data[3]);
+        jedec=(ord(data[1])<<16)+(ord(data[2])<<8)+ord(data[3]);
+        if jedec==0x1F4501:
+            self.JEDECsize=1024**2;
+        self.JEDECdevice=jedec;
         return data;
     def SPIpeek(self,adr):
         """Grab a byte from an SPI Flash ROM."""