Peter Hettkamp <peter.hettkamp@htp-tel.de> fix some problems with xsvf. Still doesn...

[openocd.git] / src / xsvf / xsvf.c

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 09736af6d185933ce1b2eaa0cd5b734108b80868..e86afbb86f39dc6bdd8dbf05660b38fb41c7d814 100644 (file)
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -2,6 +2,12 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 Peter Hettkamp                                     *
+ *   peter.hettkamp@htp-tel.de                                             *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -77,23 +83,30 @@ void xsvf_add_statemove(enum tap_state state)
 {
        enum tap_state moves[7]; /* max # of transitions */
        int i; 
-       enum tap_state curstate=cmd_queue_cur_state;
-       u8 move=tap_move[cmd_queue_cur_state][state];
+       enum tap_state curstate = cmd_queue_cur_state;
+       u8 move = TAP_MOVE(cmd_queue_cur_state, state);
        
-       if ((state!=TAP_TLR)&&(state==cmd_queue_cur_state))
+       if ((state != TAP_TLR) && (state == cmd_queue_cur_state))
                return;
+
+       if(state==TAP_TLR) 
+       {
+               jtag_add_tlr(); 
+               return; 
+       }
        for (i=0; i<7; i++)
        {
-               int j=(move>>i)&1;
+               int j = (move >> i) & 1;
                if (j)
                {
-                       curstate=tap_transitions[curstate].high;
+                       curstate = tap_transitions[curstate].high;
                } else
                {
-                       curstate=tap_transitions[curstate].low;
+                       curstate = tap_transitions[curstate].low;
                }
-               moves[i]=curstate;
+               moves[i] = curstate;
        }
+
        jtag_add_pathmove(7, moves);
 }
 
@@ -396,7 +409,27 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
                                                do_abort = 1;
                                        else
                                        {
-                                               jtag_add_pathmove(path_len, path);
+                                               int i,lasti;
+                                               /* here the trick is that jtag_add_pathmove() must end in a stable
+                                               state, so we must only invoke jtag_add_tlr() when we absolutely 
+                                               have to
+                                               */
+                                               for(i=0,lasti=0;i<path_len;i++) 
+                                               {
+                                                       if(path[i]==TAP_TLR) 
+                                                       {
+                                                               if(i>lasti)  
+                                                               {
+                                                                       jtag_add_pathmove(i-lasti,path+lasti);
+                                                               }
+                                                               lasti=i+1;
+                                                               jtag_add_tlr();
+                                                       }
+                                               }
+                                               if(i>=lasti) 
+                                               {
+                                                       jtag_add_pathmove(i-lasti, path+lasti);
+                                               }
                                        }
                                        free(path);
                                }