Dropped ugly 'blocks' kludge for a 16-bit length field.

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

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 432c725..1acc6e1 100644 (file)
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -27,12 +27,12 @@ unsigned char jtag430x2_start(){
   
   //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
   CLRRST;
   
   //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
   CLRRST;

-  delay(10);
+  delay(10);//10

   CLRTST;
 
   CLRTST;
 

-  delay(5);
+  delay(5);//5

   SETTST;
   SETTST;

-  msdelay(5);
+  msdelay(5);//5

   SETRST;
   P5DIR&=~RST;
   
   SETRST;
   P5DIR&=~RST;
   


@@ -186,7 +186,7 @@ unsigned int jtag430x2_fusecheck(){
 //! Handles MSP430X2 JTAG commands.  Forwards others to JTAG.
 void jtag430x2handle(unsigned char app,
                     unsigned char verb,
 //! Handles MSP430X2 JTAG commands.  Forwards others to JTAG.
 void jtag430x2handle(unsigned char app,
                     unsigned char verb,

-                    unsigned char len){
+                    unsigned long len){

   register char blocks;
   
   unsigned int i,val;
   register char blocks;
   
   unsigned int i,val;


@@ -194,6 +194,11 @@ void jtag430x2handle(unsigned char app,
   
   //jtag430_resettap();
   
   
   //jtag430_resettap();
   

+  if(verb!=START && jtag430mode==MSP430MODE){
+    jtag430handle(app,verb,len);
+    return;
+  }
+  

   switch(verb){
   case START:
     //Enter JTAG mode.
   switch(verb){
   case START:
     //Enter JTAG mode.


@@ -205,6 +210,9 @@ void jtag430x2handle(unsigned char app,
     if(jtagid==MSP430JTAGID){ 
       jtag430mode=MSP430MODE;
       drwidth=16;
     if(jtagid==MSP430JTAGID){ 
       jtag430mode=MSP430MODE;
       drwidth=16;

+      jtag430_resettap();
+      txdata(app,verb,1);
+      return;

     }else if(jtagid==MSP430X2JTAGID){
       jtag430mode=MSP430X2MODE;
       drwidth=20;
     }else if(jtagid==MSP430X2JTAGID){
       jtag430mode=MSP430X2MODE;
       drwidth=20;


@@ -226,16 +234,8 @@ void jtag430x2handle(unsigned char app,
     blocks=(len>4?cmddata[4]:1);
     at=cmddatalong[0];
     
     blocks=(len>4?cmddata[4]:1);
     at=cmddatalong[0];
     

-    /*
-    cmddataword[0]=jtag430x2_readmem(at);
-    txdata(app,verb,2);
-    break;
-    */
-    

     len=0x80;
     len=0x80;

-    serial_tx(app);
-    serial_tx(verb);
-    serial_tx(len);
+    txhead(app,verb,len);

     
     while(blocks--){
       for(i=0;i<len;i+=2){
     
     while(blocks--){
       for(i=0;i<len;i+=2){