Major JTAG430 and JTAG430X2 patching.

[goodfet] / firmware / apps / jtag / jtag430.c

diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index cd8b6b8..88c9f0f 100644 (file)
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -174,8 +174,6 @@ void jtag430_writeflash(unsigned int adr, unsigned int data){
 
 //! Power-On Reset
 void jtag430_por(){
-  unsigned int jtagid;
-
   // Perform Reset
   jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
   jtag_dr_shift16(0x2C01); // apply
@@ -266,7 +264,6 @@ void jtag430_resettap(){
   
 }
 
-unsigned char jtagid;
 
 //! Get the JTAG ID
 unsigned char jtag430x2_jtagid(){
@@ -373,17 +370,6 @@ void jtag430_setinstrfetch(){
   }
 }
 
-//! Grab the core ID.
-unsigned int jtag430_coreid(){
-  jtag_ir_shift8(IR_COREIP_ID);
-  return jtag_dr_shift16(0);
-}
-
-//! Grab the device ID.
-unsigned long jtag430_deviceid(){
-  jtag_ir_shift8(IR_DEVICE_ID);
-  return jtag_dr_shift20(0);
-}
 
 
 
@@ -414,15 +400,8 @@ void jtag430_handle_fn(uint8_t const app,
   
   switch(verb){
   case START:
-    /* old method, classic MSP430. 
-    //Enter JTAG mode.
-    jtag430x2_start();
-    //TAP setup, fuse check
-    jtag430_resettap();
+    debugstr("Using JTAG430 (instead of JTAG430X2)!");
     
-    cmddata[0]=jtag_ir_shift8(IR_BYPASS);    
-    txdata(app,verb,1);
-    */
     jtag430x2_start();
     cmddata[0]=jtagid;
     
@@ -551,11 +530,14 @@ void jtag430_handle_fn(uint8_t const app,
     txdata(app,verb,2);
     break;
   case JTAG430_COREIP_ID:
-    cmddataword[0]=jtag430_coreid();
+    //cmddataword[0]=jtag430_coreid();
+    cmddataword[0]=0xdead;
     txdata(app,verb,2);
     break;
   case JTAG430_DEVICE_ID:
-    cmddatalong[0]=jtag430_deviceid();
+    //cmddatalong[0]=jtag430_deviceid();
+    cmddataword[0]=0xdead;
+    cmddataword[1]=0xbeef;
     txdata(app,verb,4);
     break;
   default: