projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More glitching changes for MSP430.
[goodfet]
/
client
/
GoodFETMSP430.py
diff --git
a/client/GoodFETMSP430.py
b/client/GoodFETMSP430.py
index
0ef833c
..
fc8e99b
100644
(file)
--- a/
client/GoodFETMSP430.py
+++ b/
client/GoodFETMSP430.py
@@
-11,8
+11,10
@@
from GoodFET import GoodFET;
class GoodFETMSP430(GoodFET):
#Set APP to be MSP430APP or MSP430X2APP, the latter being preferred.
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;
CoreID=0;
DeviceID=0;
@@
-40,10
+42,13
@@
class GoodFETMSP430(GoodFET):
return DeviceID;
def peek16(self,adr,memory="vn"):
return self.MSP430peek(adr);
return DeviceID;
def peek16(self,adr,memory="vn"):
return self.MSP430peek(adr);
+ def peek(self,adr,memory="vn"):
+ return self.MSP430peek(adr);
def peek8(self,adr, memory="vn"):
adr=self.MSP430peek(adr&~1);
if adr&1==0: return adr&0xFF;
else: return adr>>8;
def peek8(self,adr, memory="vn"):
adr=self.MSP430peek(adr&~1);
if adr&1==0: return adr&0xFF;
else: return adr>>8;
+
def MSP430peek(self,adr):
"""Read a word at an address."""
self.data=[adr&0xff, (adr&0xff00)>>8,
def MSP430peek(self,adr):
"""Read a word at an address."""
self.data=[adr&0xff, (adr&0xff00)>>8,
@@
-77,6
+82,12
@@
class GoodFETMSP430(GoodFET):
val&0xff, (val&0xff00)>>8];
self.writecmd(self.MSP430APP,0xE1,6,self.data);
return ord(self.data[0])+(ord(self.data[1])<<8);
val&0xff, (val&0xff00)>>8];
self.writecmd(self.MSP430APP,0xE1,6,self.data);
return ord(self.data[0])+(ord(self.data[1])<<8);
+ def setsecret(self,value):
+ """Set a secret word for later retreival. Used by glitcher."""
+ self.MSP430pokeflash(0xFFFE,value);
+ def getsecret(self):
+ """Get a secret word. Used by glitcher."""
+ return self.peek(0xfffe);
def MSP430pokeflashblock(self,adr,data):
"""Write many words to flash memory at an address."""
self.data=[adr&0xff, (adr&0xff00)>>8,
def MSP430pokeflashblock(self,adr,data):
"""Write many words to flash memory at an address."""
self.data=[adr&0xff, (adr&0xff00)>>8,
@@
-199,7
+210,8
@@
class GoodFETMSP430(GoodFET):
print "Tests complete, erasing."
self.MSP430masserase();
print "Tests complete, erasing."
self.MSP430masserase();
-
+ def erase(self):
+ self.MSP430masserase();
def MSP430masserase(self):
"""Erase MSP430 flash memory."""
self.writecmd(self.MSP430APP,0xE3,0,None);
def MSP430masserase(self):
"""Erase MSP430 flash memory."""
self.writecmd(self.MSP430APP,0xE3,0,None);