From 779c44125a8804dabb40f59b068b55a9ac810096 Mon Sep 17 00:00:00 2001 From: oharboe Date: Wed, 22 Apr 2009 13:54:04 +0000 Subject: [PATCH] Zach Welch do not pad TMS git-svn-id: svn://svn.berlios.de/openocd/trunk@1509 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/jlink.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index f16be361d..a229cec58 100644 --- a/src/jtag/jlink.c +++ b/src/jtag/jlink.c @@ -623,6 +623,10 @@ static void jlink_tap_append_step(int tms, int tdi) int bit_index = tap_length % 8; u8 bit = 1 << bit_index; + // we do not pad TMS, so be sure to initialize all bits + if (0 == bit_index) + tms_buffer[index] = tdi_buffer[index] = 0; + if (tms) tms_buffer[index] |= bit; else @@ -669,15 +673,8 @@ static int jlink_tap_execute(void) if (!tap_length) return ERROR_OK; - /* Pad last byte so that tap_length is divisible by 8 */ - while (tap_length % 8 != 0) - { - /* More of the last TMS value keeps us in the same state, - * analogous to free-running JTAG interfaces. */ - jlink_tap_append_step(last_tms, 0); - } - - byte_length = tap_length / 8; + // number of full bytes (plus one if some would be left over) + byte_length = tap_length / 8 + !!(tap_length % 8); usb_out_buffer[0] = EMU_CMD_HW_JTAG3; usb_out_buffer[1] = 0;