projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default JEDEC entry for M25P80 on Telos B.
[goodfet]
/
client
/
GoodFETMSP430.py
diff --git
a/client/GoodFETMSP430.py
b/client/GoodFETMSP430.py
index
ef9c64d
..
e7cc368
100644
(file)
--- a/
client/GoodFETMSP430.py
+++ b/
client/GoodFETMSP430.py
@@
-10,8
+10,12
@@
import sys, time, string, cStringIO, struct, glob, serial, os;
from GoodFET import GoodFET;
class GoodFETMSP430(GoodFET):
from GoodFET import GoodFET;
class GoodFETMSP430(GoodFET):
+ #Set APP to be MSP430APP or MSP430X2APP, the latter being preferred.
+
+ #0x16 for class, 0x17 for SBW, 0x11 by default
APP=0x11;
APP=0x11;
- MSP430APP=0x11; #Changed by inheritors.
+ MSP430APP=0x11;
+
CoreID=0;
DeviceID=0;
JTAGID=0;
CoreID=0;
DeviceID=0;
JTAGID=0;
@@
-25,12
+29,12
@@
class GoodFETMSP430(GoodFET):
self.writecmd(self.MSP430APP,0x21,0,self.data);
def MSP430coreid(self):
self.writecmd(self.MSP430APP,0x21,0,self.data);
def MSP430coreid(self):
- """Get the Core ID."""
+ """Get the Core ID.
(MSP430X2 only?)
"""
self.writecmd(self.MSP430APP,0xF0);
CoreID=ord(self.data[0])+(ord(self.data[1])<<8);
return CoreID;
def MSP430deviceid(self):
self.writecmd(self.MSP430APP,0xF0);
CoreID=ord(self.data[0])+(ord(self.data[1])<<8);
return CoreID;
def MSP430deviceid(self):
- """Get the Device ID."""
+ """Get the Device ID.
(MSP430X2 only?)
"""
self.writecmd(self.MSP430APP,0xF1);
DeviceID=(
ord(self.data[0])+(ord(self.data[1])<<8)+
self.writecmd(self.MSP430APP,0xF1);
DeviceID=(
ord(self.data[0])+(ord(self.data[1])<<8)+
@@
-48,7
+52,7
@@
class GoodFETMSP430(GoodFET):
(adr&0xff0000)>>16,(adr&0xff000000)>>24,
];
self.writecmd(self.MSP430APP,0x02,4,self.data);
(adr&0xff0000)>>16,(adr&0xff000000)>>24,
];
self.writecmd(self.MSP430APP,0x02,4,self.data);
-
+ #print "Got %i bytes peeking 0x%04x." % (len(self.data),adr);
return ord(self.data[0])+(ord(self.data[1])<<8);
def MSP430peekblock(self,adr):
"""Grab a few block from an SPI Flash ROM. Block size is unknown"""
return ord(self.data[0])+(ord(self.data[1])<<8);
def MSP430peekblock(self,adr):
"""Grab a few block from an SPI Flash ROM. Block size is unknown"""
@@
-66,7
+70,7
@@
class GoodFETMSP430(GoodFET):
self.writecmd(self.MSP430APP,0x03,6,self.data);
written=ord(self.data[0])+(ord(self.data[1])<<8);
if(written!=val):
self.writecmd(self.MSP430APP,0x03,6,self.data);
written=ord(self.data[0])+(ord(self.data[1])<<8);
if(written!=val):
- print "Failed to write 0x%04x to 0x
$
04x" % (val,adr);
+ print "Failed to write 0x%04x to 0x
%
04x" % (val,adr);
return written;
def MSP430pokeflash(self,adr,val):
"""Write the contents of flash memory at an address."""
return written;
def MSP430pokeflash(self,adr,val):
"""Write the contents of flash memory at an address."""
@@
-87,6
+91,11
@@
class GoodFETMSP430(GoodFET):
"""Start debugging."""
self.writecmd(self.MSP430APP,0x20,0,self.data);
self.JTAGID=ord(self.data[0]);
"""Start debugging."""
self.writecmd(self.MSP430APP,0x20,0,self.data);
self.JTAGID=ord(self.data[0]);
+ if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
+ #Try once more
+ self.writecmd(self.MSP430APP,0x20,0,self.data);
+ self.JTAGID=ord(self.data[0]);
+
#print "Identified as %02x." % self.JTAGID;
if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
print "Error, misidentified as %02x.\nCheck wiring, as this should be 0x89 or 0x91." % self.JTAGID;
#print "Identified as %02x." % self.JTAGID;
if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
print "Error, misidentified as %02x.\nCheck wiring, as this should be 0x89 or 0x91." % self.JTAGID;