From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Sat, 26 Feb 2011 18:34:58 +0000 (+0000)
Subject: Default JEDEC entry for M25P80 on Telos B.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=44e1187885bbf7caa7cafccf7cc41d0ec3963721;hp=e93d2ec888302a130747bd52d6e6e5a56eff12fa

Default JEDEC entry for M25P80 on Telos B.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@957 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/client/GoodFETCCSPI.py b/client/GoodFETCCSPI.py
index 3e17532..39fa181 100644
--- a/client/GoodFETCCSPI.py
+++ b/client/GoodFETCCSPI.py
@@ -294,6 +294,7 @@ class GoodFETCCSPI(GoodFET):
         for foo in packet:
             s="%s %02x" % (s,ord(foo));
         print "#%s" % s;
+        
     def printdissect(self,packet):
         try:
             from scapy.all import Dot15d4
diff --git a/client/GoodFETSPI.py b/client/GoodFETSPI.py
index 9c684b7..7f48a5a 100644
--- a/client/GoodFETSPI.py
+++ b/client/GoodFETSPI.py
@@ -77,17 +77,24 @@ class GoodFETSPIFlash(GoodFETSPI):
     JEDECsize=0;
 
     def SPIjedec(self):
-        """Grab an SPI Flash ROM's JEDEC bytes."""
+        """Grab an SPI Flash ROM's JEDEC bytes.  Some chips don't implement
+        this, such as Numonyx M25P* except in the 110nm processed."""
         data=[0x9f, 0, 0, 0];
         data=self.SPItrans(data);
-        
+        jedec=0;
         self.JEDECmanufacturer=ord(data[1]);
-        self.JEDECtype=ord(data[2]);
-        self.JEDECcapacity=ord(data[3]);
+        if self.JEDECmanufacturer==0xFF:
+            self.JEDECtype=0x20;
+            self.JEDECcapacity=0x14;
+            jedec=0x202014;
+        else:
+            self.JEDECtype=ord(data[2]);
+            self.JEDECcapacity=ord(data[3]);
+            jedec=(ord(data[1])<<16)+(ord(data[2])<<8)+ord(data[3]);
         self.JEDECsize=self.JEDECsizes.get(self.JEDECcapacity);
         if self.JEDECsize==None:
             self.JEDECsize=0;
-        jedec=(ord(data[1])<<16)+(ord(data[2])<<8)+ord(data[3]);
+        
         if jedec==0x1F4501:
             self.JEDECsize=1024**2;
         self.JEDECdevice=jedec;