Closer to MSP430X2 support.

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

diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index 8b90f51..88ff455 100644 (file)
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -264,7 +264,6 @@ void jtag430_resettap(){
   
 }
 
-unsigned char jtagid;
 
 //! Get the JTAG ID
 unsigned char jtag430x2_jtagid(){
@@ -410,9 +409,13 @@ void jtag430_handle_fn(uint8_t const app,
     cmddata[0]=jtag_ir_shift8(IR_BYPASS);    
     txdata(app,verb,1);
     */
+    
     jtag430x2_start();
     cmddata[0]=jtagid;
     
+    if(jtagid!=MSP430JTAGID){
+      debugstr("Using JTAG430 (instead of JTAG430X2)!");
+    }
     jtag430mode=MSP430MODE;
     
     /* So the way this works is that a width of 20 does some