MSP430X2 cleanup, fixed switch{} falling bug in MSP430X2 command handler.

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

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index 1e1b8b9..37f7351 100755 (executable)
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -107,6 +107,7 @@ if(sys.argv[1]=="peek"):
     while start<=stop:
         print "%04x: %04x" % (start,client.MSP430peek(start));
         start=start+2;
     while start<=stop:
         print "%04x: %04x" % (start,client.MSP430peek(start));
         start=start+2;

+

 if(sys.argv[1]=="poke"):
     start=0x0000;
     val=0x00;
 if(sys.argv[1]=="poke"):
     start=0x0000;
     val=0x00;

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index b508f0b..981a048 100644 (file)
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -201,8 +201,9 @@ void jtag430x2handle(unsigned char app,
   switch(verb){
   case START:
     //Enter JTAG mode.
   switch(verb){
   case START:
     //Enter JTAG mode.

-    do cmddata[0]=jtag430x2_start();
-    while(cmddata[0]==00 || cmddata[0]==0xFF);
+    //do 
+      cmddata[0]=jtag430x2_start();
+    //while(cmddata[0]==00 || cmddata[0]==0xFF);

     
     //MSP430 or MSP430X
     if(jtagid==MSP430JTAGID){ 
     
     //MSP430 or MSP430X
     if(jtagid==MSP430JTAGID){ 


@@ -265,18 +266,22 @@ void jtag430x2handle(unsigned char app,
   case JTAG430_HALTCPU:
     //jtag430x2_haltcpu();
     break;
   case JTAG430_HALTCPU:
     //jtag430x2_haltcpu();
     break;

-  case JTAG430_RELEASECPU:
-  case JTAG430_SETINSTRFETCH:
-  case JTAG430_WRITEMEM:
+

   case POKE:
     jtag430x2_writemem(cmddatalong[0],
                       cmddataword[2]);
     cmddataword[0]=jtag430x2_readmem(cmddatalong[0]);
     txdata(app,verb,2);
     break;
   case POKE:
     jtag430x2_writemem(cmddatalong[0],
                       cmddataword[2]);
     cmddataword[0]=jtag430x2_readmem(cmddatalong[0]);
     txdata(app,verb,2);
     break;

+  case JTAG430_RELEASECPU:
+    
+  case JTAG430_SETINSTRFETCH:
+  case JTAG430_WRITEMEM:

   case JTAG430_WRITEFLASH:
   case JTAG430_ERASEFLASH:
   case JTAG430_SETPC:
   case JTAG430_WRITEFLASH:
   case JTAG430_ERASEFLASH:
   case JTAG430_SETPC:

+    txdata(app,NOK,0);
+    break;

   default:
     jtaghandle(app,verb,len);
   }
   default:
     jtaghandle(app,verb,len);
   }