From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Thu, 3 Feb 2011 22:39:48 +0000 (+0000)
Subject: Major JTAG430 and JTAG430X2 patching.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=5ea4c9f824eed5226b9939b4f28fe1fda9c14dda;ds=sidebyside

Major JTAG430 and JTAG430X2 patching.
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
---

diff --git a/client/GoodFET.py b/client/GoodFET.py
index 4aec90b..ef21833 100755
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -358,21 +358,21 @@ class GoodFET:
         """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]);
-    def peekword(self,address):
+    def MONpeek16(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 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."""
-        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.
@@ -404,7 +404,7 @@ class GoodFET:
     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."""
@@ -460,12 +460,12 @@ class GoodFET:
         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 self.peekbyte(0x0021)!=0:
+            if self.MONpeek8(0x0021)!=0:
                 print "ERROR, P1OUT not cleared.";
             self.pokebyte(0x0021,1); #Light LED
             if not self.monitorecho():
@@ -509,16 +509,16 @@ class GoodFET:
     
     def monitorsetclock(self,clock):
         """Set the clocking value."""
-        self.poke16(0x56, clock);
+        self.MONpoke16(0x56, clock);
     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):
-        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.";
@@ -559,10 +559,7 @@ class GoodFET:
                 (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);
diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 933e7dc..0ef833c 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -10,9 +10,10 @@ import sys, time, string, cStringIO, struct, glob, serial, os;
 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.
-    MSP430X2APP=0x16;  #Changed by inheritors.
+    
     CoreID=0;
     DeviceID=0;
     JTAGID=0;
@@ -49,7 +50,7 @@ class GoodFETMSP430(GoodFET):
                    (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"""
diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index 0cca0fd..b509ea1 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -34,8 +34,8 @@ client.setup();
 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(),