From 8a7464df2d314e5a8ee07da4ae370a2327eaf024 Mon Sep 17 00:00:00 2001 From: oharboe Date: Mon, 3 Nov 2008 13:30:43 +0000 Subject: [PATCH] Peter Hettkamp fix some problems with xsvf. Still doesn't work. git-svn-id: svn://svn.berlios.de/openocd/trunk@1127 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/xsvf/xsvf.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index d732871a5..e86afbb86 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -5,6 +5,9 @@ * 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 * @@ -86,6 +89,11 @@ void xsvf_add_statemove(enum tap_state 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; @@ -401,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;ilasti) + { + 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); }