From 040e6cef41d77f6692f2f5e9c5849e6d8fbeeefd Mon Sep 17 00:00:00 2001 From: oharboe Date: Thu, 4 Jun 2009 12:12:38 +0000 Subject: [PATCH] no longer use jtag_add_xxx() to set end state to TAP_DRPAUSE git-svn-id: svn://svn.berlios.de/openocd/trunk@2045 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/pld/virtex2.c | 6 +++--- src/target/arm11_dbgtap.c | 2 +- src/target/arm7tdmi.c | 4 ++-- src/target/arm9tdmi.c | 4 ++-- src/xsvf/xsvf.c | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 8f4fee2975..51991c3bb6 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -85,7 +85,7 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words) virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */ - jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE)); free(values); @@ -113,7 +113,7 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word { scan_field.in_value = (u8 *)words; - jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_callback(virtexflip32, (u8 *)words); @@ -179,7 +179,7 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename) field.num_bits = bit_file.length * 8; field.out_value = bit_file.data; - jtag_add_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); jtag_execute_queue(); jtag_add_tlr(); diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c index 025c69e8ad..06b002dea9 100644 --- a/src/target/arm11_dbgtap.c +++ b/src/target/arm11_dbgtap.c @@ -526,7 +526,7 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, u32 opcode, u32 * if (count) { - jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE); + jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_pathmove(asizeof(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay), arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay); } diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index 1c672cc3c4..e3185bec86 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -116,7 +116,7 @@ int arm7tdmi_examine_debug_reason(target_t *target) } arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL); - jtag_add_dr_scan(2, fields, TAP_DRPAUSE); + jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE)); if((retval = jtag_execute_queue()) != ERROR_OK) { return retval; @@ -127,7 +127,7 @@ int arm7tdmi_examine_debug_reason(target_t *target) fields[1].in_value = NULL; fields[1].out_value = databus; - jtag_add_dr_scan(2, fields, TAP_DRPAUSE); + jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE)); if (breakpoint & 1) target->debug_reason = DBG_REASON_WATCHPOINT; diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index dba679aa7d..c4f7e08fd0 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -134,7 +134,7 @@ int arm9tdmi_examine_debug_reason(target_t *target) } arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL); - jtag_add_dr_scan(3, fields, TAP_DRPAUSE); + jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE)); if ((retval = jtag_execute_queue()) != ERROR_OK) { return retval; @@ -147,7 +147,7 @@ int arm9tdmi_examine_debug_reason(target_t *target) fields[2].in_value = NULL; fields[2].out_value = instructionbus; - jtag_add_dr_scan(3, fields, TAP_DRPAUSE); + jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE)); if (debug_reason & 0x4) if (debug_reason & 0x2) diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index 0ec9f4dca2..7aaab3ad5e 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -405,9 +405,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha field.in_value = calloc(CEIL(field.num_bits, 8), 1); if (tap == NULL) - jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); else - jtag_add_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); jtag_check_value_mask(&field, dr_in_buf, dr_in_mask); @@ -853,9 +853,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha LOG_USER("LSDR retry %d", attempt); if (tap == NULL) - jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); else - jtag_add_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); jtag_check_value_mask(&field, dr_in_buf, dr_in_mask); -- 2.30.2