summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6d6a522)
Swapped the APP numbers to fix the unneighborliness at startup and to let JTAG430 run on its own.
git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@877
12e2690d-a6be-4b82-a7b7-
67c4a43b65c8
"""Execute supplied code."""
self.writecmd(0,0x31,2,#len(code),
code);
"""Execute supplied code."""
self.writecmd(0,0x31,2,#len(code),
code);
- def peekbyte(self,address):
+ def MONpeek8(self,address):
"""Read a byte of memory from the monitor."""
self.data=[address&0xff,address>>8];
self.writecmd(0,0x02,2,self.data);
#self.readcmd();
return ord(self.data[0]);
"""Read a byte of memory from the monitor."""
self.data=[address&0xff,address>>8];
self.writecmd(0,0x02,2,self.data);
#self.readcmd();
return ord(self.data[0]);
- def peekword(self,address):
+ def MONpeek16(self,address):
"""Read a word of memory from the monitor."""
"""Read a word of memory from the monitor."""
- return self.peekbyte(address)+(self.peekbyte(address+1)<<8);
+ return self.MONpeek8(address)+(self.MONpeek8(address+1)<<8);
def peek(self,address):
"""Read a word of memory from the monitor."""
def peek(self,address):
"""Read a word of memory from the monitor."""
- return self.peekbyte(address)+(self.peekbyte(address+1)<<8);
+ return self.MONpeek8(address)+(self.MONpeek8(address+1)<<8);
def eeprompeek(self,address):
"""Read a word of memory from the monitor."""
def eeprompeek(self,address):
"""Read a word of memory from the monitor."""
- return self.peekbyte(address)+(self.peekbyte(address+1)<<8);
+ return self.MONpeek8(address)+(self.MONpeek8(address+1)<<8);
def peekbysym(self,name):
"""Read a value by its symbol name."""
#TODO include memory in symbol.
def peekbysym(self,name):
"""Read a value by its symbol name."""
#TODO include memory in symbol.
def dumpmem(self,begin,end):
i=begin;
while i<end:
def dumpmem(self,begin,end):
i=begin;
while i<end:
- print "%04x %04x" % (i, self.peekword(i));
+ print "%04x %04x" % (i, self.MONpeek16(i));
i+=2;
def monitor_ram_pattern(self):
"""Overwrite all of RAM with 0xBEEF."""
i+=2;
def monitor_ram_pattern(self):
"""Overwrite all of RAM with 0xBEEF."""
print "Performing monitor self-test.";
self.monitorclocking();
for f in range(0,3000):
print "Performing monitor self-test.";
self.monitorclocking();
for f in range(0,3000):
- a=self.peekword(0x0c00);
- b=self.peekword(0x0c02);
+ a=self.MONpeek16(0x0c00);
+ b=self.MONpeek16(0x0c02);
if a!=0x0c04 and a!=0x0c06:
print "ERROR Fetched %04x, %04x" % (a,b);
self.pokebyte(0x0021,0); #Drop LED
if a!=0x0c04 and a!=0x0c06:
print "ERROR Fetched %04x, %04x" % (a,b);
self.pokebyte(0x0021,0); #Drop LED
- if self.peekbyte(0x0021)!=0:
+ if self.MONpeek8(0x0021)!=0:
print "ERROR, P1OUT not cleared.";
self.pokebyte(0x0021,1); #Light LED
if not self.monitorecho():
print "ERROR, P1OUT not cleared.";
self.pokebyte(0x0021,1); #Light LED
if not self.monitorecho():
def monitorsetclock(self,clock):
"""Set the clocking value."""
def monitorsetclock(self,clock):
"""Set the clocking value."""
- self.poke16(0x56, clock);
+ self.MONpoke16(0x56, clock);
def monitorgetclock(self):
"""Get the clocking value."""
def monitorgetclock(self):
"""Get the clocking value."""
- return self.peek16(0x56);
+ return self.MONpeek16(0x56);
# The following functions ought to be implemented in
# every client.
def infostring(self):
# The following functions ought to be implemented in
# every client.
def infostring(self):
- a=self.peekbyte(0xff0);
- b=self.peekbyte(0xff1);
+ a=self.MONpeek8(0xff0);
+ b=self.MONpeek8(0xff1);
return "%02x%02x" % (a,b);
def lock(self):
print "Locking Unsupported.";
return "%02x%02x" % (a,b);
def lock(self):
print "Locking Unsupported.";
(self.peek8(address+1,memory)<<8));
def peek8(self,address, memory="vn"):
"""Peek a byte of memory."""
(self.peek8(address+1,memory)<<8));
def peek8(self,address, memory="vn"):
"""Peek a byte of memory."""
- return self.peekbyte(address); #monitor
- def peekword(self,address, memory="vn"):
- """Peek a natively sized word of memory."""
- return self.peek16(address); #monitor
+ return self.MONpeek8(address); #monitor
def peekblock(self,address,length,memory="vn"):
"""Return a block of data."""
data=range(0,length);
def peekblock(self,address,length,memory="vn"):
"""Return a block of data."""
data=range(0,length);
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.
APP=0x11;
MSP430APP=0x11; #Changed by inheritors.
APP=0x11;
MSP430APP=0x11; #Changed by inheritors.
- MSP430X2APP=0x16; #Changed by inheritors.
CoreID=0;
DeviceID=0;
JTAGID=0;
CoreID=0;
DeviceID=0;
JTAGID=0;
(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"""
client.start();
if(sys.argv[1]=="info"):
client.start();
if(sys.argv[1]=="info"):
- #print "Model %08x " % client.MSP430deviceid();
- #print "Core %04x " % client.MSP430coreid();
+ print "Model %08x " % client.MSP430deviceid();
+ print "Core %04x " % client.MSP430coreid();
#print "Identity %04x" % client.MSP430ident();
print "Identifies as %s (%04x)" % (
client.MSP430identstr(),
#print "Identity %04x" % client.MSP430ident();
print "Identifies as %s (%04x)" % (
client.MSP430identstr(),