From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Wed, 30 Sep 2009 03:25:13 +0000 (+0000)
Subject: Restoring 16-bit MSP430 support.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=92e6902f33716d1e909896c589491b09dec216fa;hp=e3e1bb605963def746b50f62277180e567d3b615

Restoring 16-bit MSP430 support.

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

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 743ba55..9186046 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -64,7 +64,7 @@ class GoodFETMSP430(GoodFET):
         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." % id;
+            print "Error, misidentified as %02x." % self.JTAGID;
         
     def MSP430haltcpu(self):
         """Halt the CPU."""
diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index d937b4d..cf5179d 100644
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -240,11 +240,11 @@ void jtag430_start(){
   
   //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
   CLRRST;
-  delay(100);
+  delay(100); //100
   CLRTST;
-  delay(50);
+  delay(50);  //50
   SETTST;
-  delay(50);
+  delay(50);  //50
   SETRST;
   P5DIR&=~RST;
   delay(0xFFFF);
@@ -320,6 +320,14 @@ void oldjtag430handle(unsigned char app,
     jtag430_setpc(cmddataword[0]);
     txdata(app,verb,0);
     break;
+    
+  case JTAG430_COREIP_ID:
+  case JTAG430_DEVICE_ID:
+    cmddataword[0]=0;
+    cmddataword[1]=0;
+    txdata(app,verb,4);
+    break;
+    
   default:
     jtaghandle(app,verb,len);
   }
diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 432c725..fb22cee 100644
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -194,6 +194,11 @@ void jtag430x2handle(unsigned char app,
   
   //jtag430_resettap();
   
+  if(verb!=START && jtag430mode==MSP430MODE){
+    jtag430handle(app,verb,len);
+    return;
+  }
+  
   switch(verb){
   case START:
     //Enter JTAG mode.