X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETSPI.py;h=5d42354c4f50bfc8567469b389a76ff63587f6b2;hp=bee77f5c2691cd47ecf055beca1ea2f4e2a5a438;hb=27317fc9af778f929496abb25ddb1ac68b1beb4e;hpb=fbf1dcfd59f6213926c78178115c1b7110afdf8f

diff --git a/client/GoodFETSPI.py b/client/GoodFETSPI.py
index bee77f5..5d42354 100644
--- a/client/GoodFETSPI.py
+++ b/client/GoodFETSPI.py
@@ -29,29 +29,39 @@ class GoodFETSPIFlash(GoodFETSPI):
     JEDECmanufacturers={0xFF: "MISSING",
                         0xEF: "Winbond",
                         0xC2: "MXIC",
-                        0x20: "Numonyx/ST"
+                        0x20: "Numonyx/ST",
+                        0x1F: "Atmel"
                         };
 
     JEDECdevices={0xFFFFFF: "MISSING",
+                  0xEF3015: "W25X16L",
                   0xEF3014: "W25X80L",
                   0xEF3013: "W25X40L",
                   0xEF3012: "W25X20L",
                   0xEF3011: "W25X10L",
+                  0xC22017: "MX25L6405D",
+                  0xC22016: "MX25L3205D",
+                  0xC22015: "MX25L1605D",
                   0xC22014: "MX25L8005",
                   0xC22013: "MX25L4005",
                   0x204011: "M45PE10"
                   };
-    JEDECsizes={0x14: 0x100000,
+    
+    JEDECsizes={0x17: 0x800000,
+                0x16: 0x400000,
+                0x15: 0x200000,
+                0x14: 0x100000,
                 0x13: 0x080000,
                 0x12: 0x040000,
-                0x11: 0x020000}
+                0x11: 0x020000
+                };
+    
     JEDECsize=0;
 
     def SPIjedec(self):
         """Grab an SPI Flash ROM's JEDEC bytes."""
         data=[0x9f, 0, 0, 0];
         data=self.SPItrans(data);
-        #print "Manufacturer: %02x\nType: %02x\nCapacity: %02x" % (ord(data[1]),ord(data[2]),ord(data[3]));
         self.JEDECmanufacturer=ord(data[1]);
         self.JEDECtype=ord(data[2]);
         self.JEDECcapacity=ord(data[3]);