interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename jtag_add_end_state to jtag_set_end_state since "add" implies that 

this fn has something to do with the queue, which it does not as such.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2050 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-06-04 13:18:07 +00:00
parent f133158175
commit d861002612
24 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/flash/str9xpec.c
View File

@ -137,7 +137,7 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap)
field.in_value = &status; field.in_value = &status;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
jtag_execute_queue(); jtag_execute_queue();
LOG_DEBUG("status: 0x%2.2x", status); LOG_DEBUG("status: 0x%2.2x", status);
@ -225,7 +225,7 @@ static int str9xpec_read_config(struct flash_bank_s *bank)
field.in_value = str9xpec_info->options; field.in_value = str9xpec_info->options;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
jtag_execute_queue(); jtag_execute_queue();
status = str9xpec_isc_status(tap); status = str9xpec_isc_status(tap);
@ -372,7 +372,7 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
field.out_value = buffer; field.out_value = buffer;
field.in_value = NULL; field.in_value = NULL;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
jtag_add_sleep(40000); jtag_add_sleep(40000);
/* read blank check result */ /* read blank check result */
@ -478,7 +478,7 @@ static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
field.out_value = buffer; field.out_value = buffer;
field.in_value = NULL; field.in_value = NULL;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
jtag_execute_queue(); jtag_execute_queue();
jtag_add_sleep(10); jtag_add_sleep(10);
@ -704,7 +704,7 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
field.out_value = (buffer + bytes_written); field.out_value = (buffer + bytes_written);
field.in_value = NULL; field.in_value = NULL;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
/* small delay before polling */ /* small delay before polling */
jtag_add_sleep(50); jtag_add_sleep(50);
@ -754,7 +754,7 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
field.out_value = last_dword; field.out_value = last_dword;
field.in_value = NULL; field.in_value = NULL;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
/* small delay before polling */ /* small delay before polling */
jtag_add_sleep(50); jtag_add_sleep(50);
@ -826,7 +826,7 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch
field.out_value = NULL; field.out_value = NULL;
field.in_value = buffer; field.in_value = buffer;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
jtag_execute_queue(); jtag_execute_queue();
idcode = buf_get_u32(buffer, 0, 32); idcode = buf_get_u32(buffer, 0, 32);
@ -946,7 +946,7 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
field.out_value = str9xpec_info->options; field.out_value = str9xpec_info->options;
field.in_value = NULL; field.in_value = NULL;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
/* small delay before polling */ /* small delay before polling */
jtag_add_sleep(50); jtag_add_sleep(50);

6
src/jtag/jtag.c
View File

@ -750,7 +750,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
if (trst_with_tlr) if (trst_with_tlr)
{ {
LOG_DEBUG("JTAG reset with RESET instead of TRST"); LOG_DEBUG("JTAG reset with RESET instead of TRST");
jtag_add_end_state(TAP_RESET); jtag_set_end_state(TAP_RESET);
jtag_add_tlr(); jtag_add_tlr();
return; return;
} }
@ -771,7 +771,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
} }
} }
tap_state_t jtag_add_end_state(tap_state_t state) tap_state_t jtag_set_end_state(tap_state_t state)
{ {
if ((state == TAP_DRSHIFT)||(state == TAP_IRSHIFT)) if ((state == TAP_DRSHIFT)||(state == TAP_IRSHIFT))
{ {
@ -2179,7 +2179,7 @@ static int handle_endstate_command(struct command_context_s *cmd_ctx, char *cmd,
command_print( cmd_ctx, "Invalid state name: %s\n", args[0] ); command_print( cmd_ctx, "Invalid state name: %s\n", args[0] );
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} }
jtag_add_end_state(state); jtag_set_end_state(state);
jtag_execute_queue(); jtag_execute_queue();
} }
command_print(cmd_ctx, "current endstate: %s", tap_state_name(cmd_queue_end_state)); command_print(cmd_ctx, "current endstate: %s", tap_state_name(cmd_queue_end_state));

4
src/jtag/jtag.h
View File

@ -488,14 +488,14 @@ extern void jtag_add_reset(int req_tlr_or_trst, int srst);
/** /**
* Function jtag_add_end_state * Function jtag_set_end_state
* *
* Set a global variable to \a state if \a state != TAP_INVALID. * Set a global variable to \a state if \a state != TAP_INVALID.
* *
* Return the value of the global variable. * Return the value of the global variable.
* *
**/ **/
extern tap_state_t jtag_add_end_state(tap_state_t state); extern tap_state_t jtag_set_end_state(tap_state_t state);
/** /**
* Function jtag_get_end_state * Function jtag_get_end_state
* *

2
src/jtag/minidriver.h
View File

@ -120,7 +120,7 @@ extern int interface_jtag_add_runtest(int num_cycles, tap_state_t endstate);
* approperiate * approperiate
*/ */
extern int interface_jtag_add_reset(int trst, int srst); extern int interface_jtag_add_reset(int trst, int srst);
extern int interface_jtag_add_end_state(tap_state_t endstate); extern int interface_jtag_set_end_state(tap_state_t endstate);
extern int interface_jtag_add_sleep(u32 us); extern int interface_jtag_add_sleep(u32 us);
extern int interface_jtag_add_clocks(int num_cycles); extern int interface_jtag_add_clocks(int num_cycles);
extern int interface_jtag_execute_queue(void); extern int interface_jtag_execute_queue(void);

2
src/jtag/zy1000.c
View File

@ -499,7 +499,7 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
} }
} }
int interface_jtag_add_end_state(tap_state_t state) int interface_jtag_set_end_state(tap_state_t state)
{ {
return ERROR_OK; return ERROR_OK;
} }

16
src/pld/virtex2.c
View File

@ -58,7 +58,7 @@ int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_IDLE)); jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE));
free(field.out_value); free(field.out_value);
} }
@ -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 */ virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */
jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
free(values); 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; scan_field.in_value = (u8 *)words;
jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
jtag_add_callback(virtexflip32, (u8 *)words); jtag_add_callback(virtexflip32, (u8 *)words);
@ -165,7 +165,7 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename)
if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK) if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)
return retval; return retval;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */ virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */
jtag_execute_queue(); jtag_execute_queue();
jtag_add_sleep(1000); jtag_add_sleep(1000);
@ -179,18 +179,18 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename)
field.num_bits = bit_file.length * 8; field.num_bits = bit_file.length * 8;
field.out_value = bit_file.data; field.out_value = bit_file.data;
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
jtag_execute_queue(); jtag_execute_queue();
jtag_add_tlr(); jtag_add_tlr();
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
jtag_add_runtest(13, jtag_add_end_state(TAP_IDLE)); jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE));
virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
jtag_add_runtest(13, jtag_add_end_state(TAP_IDLE)); jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE));
virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
jtag_execute_queue(); jtag_execute_queue();

6
src/target/arm11_dbgtap.c
View File

@ -439,7 +439,7 @@ int arm11_run_instr_data_to_core(arm11_common_t * arm11, u32 opcode, u32 * data,
{ {
Data = *data; Data = *data;
arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_IDLE)); arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, jtag_set_end_state(TAP_IDLE));
CHECK_RETVAL(jtag_execute_queue()); CHECK_RETVAL(jtag_execute_queue());
@ -526,13 +526,13 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, u32 opcode, u32 *
if (count) if (count)
{ {
jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_set_end_state(TAP_DRPAUSE));
jtag_add_pathmove(asizeof(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay), jtag_add_pathmove(asizeof(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay); arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
} }
else else
{ {
jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_set_end_state(TAP_IDLE));
} }
} }

2
src/target/arm720t.c
View File

@ -96,7 +96,7 @@ int arm720t_scan_cp15(target_t *target, u32 out, u32 *in, int instruction, int c
buf_set_u32(out_buf, 0, 32, flip_u32(out, 32)); buf_set_u32(out_buf, 0, 32, flip_u32(out, 32));
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
if((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK) if((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
{ {
return retval; return retval;

8
src/target/arm7_9_common.c
View File

@ -693,7 +693,7 @@ int arm7_9_execute_sys_speed(struct target_s *target)
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
/* set RESTART instruction */ /* set RESTART instruction */
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
if (arm7_9->need_bypass_before_restart) { if (arm7_9->need_bypass_before_restart) {
arm7_9->need_bypass_before_restart = 0; arm7_9->need_bypass_before_restart = 0;
arm_jtag_set_instr(jtag_info, 0xf, NULL); arm_jtag_set_instr(jtag_info, 0xf, NULL);
@ -747,7 +747,7 @@ int arm7_9_execute_fast_sys_speed(struct target_s *target)
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
/* set RESTART instruction */ /* set RESTART instruction */
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
if (arm7_9->need_bypass_before_restart) { if (arm7_9->need_bypass_before_restart) {
arm7_9->need_bypass_before_restart = 0; arm7_9->need_bypass_before_restart = 0;
arm_jtag_set_instr(jtag_info, 0xf, NULL); arm_jtag_set_instr(jtag_info, 0xf, NULL);
@ -1724,14 +1724,14 @@ int arm7_9_restart_core(struct target_s *target)
arm_jtag_t *jtag_info = &arm7_9->jtag_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info;
/* set RESTART instruction */ /* set RESTART instruction */
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
if (arm7_9->need_bypass_before_restart) { if (arm7_9->need_bypass_before_restart) {
arm7_9->need_bypass_before_restart = 0; arm7_9->need_bypass_before_restart = 0;
arm_jtag_set_instr(jtag_info, 0xf, NULL); arm_jtag_set_instr(jtag_info, 0xf, NULL);
} }
arm_jtag_set_instr(jtag_info, 0x4, NULL); arm_jtag_set_instr(jtag_info, 0x4, NULL);
jtag_add_runtest(1, jtag_add_end_state(TAP_IDLE)); jtag_add_runtest(1, jtag_set_end_state(TAP_IDLE));
return jtag_execute_queue(); return jtag_execute_queue();
} }

12
src/target/arm7tdmi.c
View File

@ -98,7 +98,7 @@ int arm7tdmi_examine_debug_reason(target_t *target)
u8 databus[4]; u8 databus[4];
u8 breakpoint; u8 breakpoint;
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
fields[0].tap = arm7_9->jtag_info.tap; fields[0].tap = arm7_9->jtag_info.tap;
fields[0].num_bits = 1; fields[0].num_bits = 1;
@ -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); arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(2, fields, jtag_set_end_state(TAP_DRPAUSE));
if((retval = jtag_execute_queue()) != ERROR_OK) if((retval = jtag_execute_queue()) != ERROR_OK)
{ {
return retval; return retval;
@ -127,7 +127,7 @@ int arm7tdmi_examine_debug_reason(target_t *target)
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[1].out_value = databus; fields[1].out_value = databus;
jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(2, fields, jtag_set_end_state(TAP_DRPAUSE));
if (breakpoint & 1) if (breakpoint & 1)
target->debug_reason = DBG_REASON_WATCHPOINT; target->debug_reason = DBG_REASON_WATCHPOINT;
@ -157,7 +157,7 @@ static __inline int arm7tdmi_clock_out_inner(arm_jtag_t *jtag_info, u32 out, int
/* put an instruction in the ARM7TDMI pipeline or write the data bus, and optionally read data */ /* put an instruction in the ARM7TDMI pipeline or write the data bus, and optionally read data */
static __inline int arm7tdmi_clock_out(arm_jtag_t *jtag_info, u32 out, u32 *deprecated, int breakpoint) static __inline int arm7tdmi_clock_out(arm_jtag_t *jtag_info, u32 out, u32 *deprecated, int breakpoint)
{ {
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
arm_jtag_scann(jtag_info, 0x1); arm_jtag_scann(jtag_info, 0x1);
arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
@ -170,7 +170,7 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
int retval = ERROR_OK; int retval = ERROR_OK;
scan_field_t fields[2]; scan_field_t fields[2];
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK) if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
{ {
return retval; return retval;
@ -260,7 +260,7 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
int retval = ERROR_OK; int retval = ERROR_OK;
scan_field_t fields[2]; scan_field_t fields[2];
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK) if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
{ {
return retval; return retval;

6
src/target/arm920t.c
View File

@ -103,7 +103,7 @@ int arm920t_read_cp15_physical(target_t *target, int reg_addr, u32 *value)
u8 reg_addr_buf = reg_addr & 0x3f; u8 reg_addr_buf = reg_addr & 0x3f;
u8 nr_w_buf = 0; u8 nr_w_buf = 0;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(jtag_info, 0xf); arm_jtag_scann(jtag_info, 0xf);
arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
@ -156,7 +156,7 @@ int arm920t_write_cp15_physical(target_t *target, int reg_addr, u32 value)
buf_set_u32(value_buf, 0, 32, value); buf_set_u32(value_buf, 0, 32, value);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(jtag_info, 0xf); arm_jtag_scann(jtag_info, 0xf);
arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
@ -201,7 +201,7 @@ int arm920t_execute_cp15(target_t *target, u32 cp15_opcode, u32 arm_opcode)
u8 nr_w_buf = 0; u8 nr_w_buf = 0;
u8 cp15_opcode_buf[4]; u8 cp15_opcode_buf[4];
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(jtag_info, 0xf); arm_jtag_scann(jtag_info, 0xf);
arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);

4
src/target/arm926ejs.c
View File

@ -129,7 +129,7 @@ int arm926ejs_cp15_read(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u3
buf_set_u32(address_buf, 0, 14, address); buf_set_u32(address_buf, 0, 14, address);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK) if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
{ {
return retval; return retval;
@ -200,7 +200,7 @@ int arm926ejs_cp15_write(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u
buf_set_u32(address_buf, 0, 14, address); buf_set_u32(address_buf, 0, 14, address);
buf_set_u32(value_buf, 0, 32, value); buf_set_u32(value_buf, 0, 32, value);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK) if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
{ {
return retval; return retval;

4
src/target/arm966e.c
View File

@ -167,7 +167,7 @@ int arm966e_read_cp15(target_t *target, int reg_addr, u32 *value)
u8 reg_addr_buf = reg_addr & 0x3f; u8 reg_addr_buf = reg_addr & 0x3f;
u8 nr_w_buf = 0; u8 nr_w_buf = 0;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK) if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
{ {
return retval; return retval;
@ -222,7 +222,7 @@ int arm966e_write_cp15(target_t *target, int reg_addr, u32 value)
buf_set_u32(value_buf, 0, 32, value); buf_set_u32(value_buf, 0, 32, value);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK) if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
{ {
return retval; return retval;

12
src/target/arm9tdmi.c
View File

@ -111,7 +111,7 @@ int arm9tdmi_examine_debug_reason(target_t *target)
u8 instructionbus[4]; u8 instructionbus[4];
u8 debug_reason; u8 debug_reason;
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
fields[0].tap = arm7_9->jtag_info.tap; fields[0].tap = arm7_9->jtag_info.tap;
fields[0].num_bits = 32; fields[0].num_bits = 32;
@ -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); arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_DRPAUSE));
if ((retval = jtag_execute_queue()) != ERROR_OK) if ((retval = jtag_execute_queue()) != ERROR_OK)
{ {
return retval; return retval;
@ -147,7 +147,7 @@ int arm9tdmi_examine_debug_reason(target_t *target)
fields[2].in_value = NULL; fields[2].in_value = NULL;
fields[2].out_value = instructionbus; fields[2].out_value = instructionbus;
jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_DRPAUSE));
if (debug_reason & 0x4) if (debug_reason & 0x4)
if (debug_reason & 0x2) if (debug_reason & 0x2)
@ -178,7 +178,7 @@ int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int s
if (sysspeed) if (sysspeed)
buf_set_u32(&sysspeed_buf, 2, 1, 1); buf_set_u32(&sysspeed_buf, 2, 1, 1);
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK) if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
{ {
return retval; return retval;
@ -240,7 +240,7 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
int retval = ERROR_OK;; int retval = ERROR_OK;;
scan_field_t fields[3]; scan_field_t fields[3];
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK) if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
{ {
return retval; return retval;
@ -307,7 +307,7 @@ int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
int retval = ERROR_OK; int retval = ERROR_OK;
scan_field_t fields[3]; scan_field_t fields[3];
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK) if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
{ {
return retval; return retval;

8
src/target/arm_adi_v5.c
View File

@ -65,12 +65,12 @@ int adi_jtag_dp_scan(swjdp_common_t *swjdp, u8 instr, u8 reg_addr, u8 RnW, u8 *o
scan_field_t fields[2]; scan_field_t fields[2];
u8 out_addr_buf; u8 out_addr_buf;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_set_instr(jtag_info, instr, NULL); arm_jtag_set_instr(jtag_info, instr, NULL);
/* Add specified number of tck clocks before accessing memory bus */ /* Add specified number of tck clocks before accessing memory bus */
if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0)) if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0))
jtag_add_runtest(swjdp->memaccess_tck, jtag_add_end_state(TAP_IDLE)); jtag_add_runtest(swjdp->memaccess_tck, jtag_set_end_state(TAP_IDLE));
fields[0].tap = jtag_info->tap; fields[0].tap = jtag_info->tap;
fields[0].num_bits = 3; fields[0].num_bits = 3;
@ -96,12 +96,12 @@ int adi_jtag_dp_scan_u32(swjdp_common_t *swjdp, u8 instr, u8 reg_addr, u8 RnW, u
u8 out_value_buf[4]; u8 out_value_buf[4];
u8 out_addr_buf; u8 out_addr_buf;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_set_instr(jtag_info, instr, NULL); arm_jtag_set_instr(jtag_info, instr, NULL);
/* Add specified number of tck clocks before accessing memory bus */ /* Add specified number of tck clocks before accessing memory bus */
if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0)) if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0))
jtag_add_runtest(swjdp->memaccess_tck, jtag_add_end_state(TAP_IDLE)); jtag_add_runtest(swjdp->memaccess_tck, jtag_set_end_state(TAP_IDLE));
fields[0].tap = jtag_info->tap; fields[0].tap = jtag_info->tap;
fields[0].num_bits = 3; fields[0].num_bits = 3;

4
src/target/avrt.c
View File

@ -218,7 +218,7 @@ int mcu_write_ir(jtag_tap_t *tap, u8 *ir_in, u8 *ir_out, int ir_len, int rti)
field[0].num_bits = tap->ir_length; field[0].num_bits = tap->ir_length;
field[0].out_value = ir_out; field[0].out_value = ir_out;
field[0].in_value = ir_in; field[0].in_value = ir_in;
jtag_add_plain_ir_scan(sizeof(field) / sizeof(field[0]), field, jtag_add_end_state(TAP_IDLE)); jtag_add_plain_ir_scan(sizeof(field) / sizeof(field[0]), field, jtag_set_end_state(TAP_IDLE));
} }
return ERROR_OK; return ERROR_OK;
@ -239,7 +239,7 @@ int mcu_write_dr(jtag_tap_t *tap, u8 *dr_in, u8 *dr_out, int dr_len, int rti)
field[0].num_bits = dr_len; field[0].num_bits = dr_len;
field[0].out_value = dr_out; field[0].out_value = dr_out;
field[0].in_value = dr_in; field[0].in_value = dr_in;
jtag_add_plain_dr_scan(sizeof(field) / sizeof(field[0]), field, jtag_add_end_state(TAP_IDLE)); jtag_add_plain_dr_scan(sizeof(field) / sizeof(field[0]), field, jtag_set_end_state(TAP_IDLE));
} }
return ERROR_OK; return ERROR_OK;

10
src/target/embeddedice.c
View File

@ -238,7 +238,7 @@ int embeddedice_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
u8 field1_out[1]; u8 field1_out[1];
u8 field2_out[1]; u8 field2_out[1];
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(ice_reg->jtag_info, 0x2); arm_jtag_scann(ice_reg->jtag_info, 0x2);
arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL); arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL);
@ -293,7 +293,7 @@ int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size)
u8 field1_out[1]; u8 field1_out[1];
u8 field2_out[1]; u8 field2_out[1];
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(jtag_info, 0x2); arm_jtag_scann(jtag_info, 0x2);
arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
@ -369,7 +369,7 @@ void embeddedice_write_reg(reg_t *reg, u32 value)
LOG_DEBUG("%i: 0x%8.8x", ice_reg->addr, value); LOG_DEBUG("%i: 0x%8.8x", ice_reg->addr, value);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(ice_reg->jtag_info, 0x2); arm_jtag_scann(ice_reg->jtag_info, 0x2);
arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL); arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL);
@ -395,7 +395,7 @@ int embeddedice_send(arm_jtag_t *jtag_info, u32 *data, u32 size)
u8 field1_out[1]; u8 field1_out[1];
u8 field2_out[1]; u8 field2_out[1];
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(jtag_info, 0x2); arm_jtag_scann(jtag_info, 0x2);
arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
@ -450,7 +450,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout)
else else
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(jtag_info, 0x2); arm_jtag_scann(jtag_info, 0x2);
arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);

6
src/target/etb.c
View File

@ -169,7 +169,7 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
scan_field_t fields[3]; scan_field_t fields[3];
int i; int i;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
etb_scann(etb, 0x0); etb_scann(etb, 0x0);
etb_set_instr(etb, 0xc); etb_set_instr(etb, 0xc);
@ -225,7 +225,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
LOG_DEBUG("%i", etb_reg->addr); LOG_DEBUG("%i", etb_reg->addr);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
etb_scann(etb_reg->etb, 0x0); etb_scann(etb_reg->etb, 0x0);
etb_set_instr(etb_reg->etb, 0xc); etb_set_instr(etb_reg->etb, 0xc);
@ -314,7 +314,7 @@ int etb_write_reg(reg_t *reg, u32 value)
LOG_DEBUG("%i: 0x%8.8x", etb_reg->addr, value); LOG_DEBUG("%i: 0x%8.8x", etb_reg->addr, value);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
etb_scann(etb_reg->etb, 0x0); etb_scann(etb_reg->etb, 0x0);
etb_set_instr(etb_reg->etb, 0xc); etb_set_instr(etb_reg->etb, 0xc);

4
src/target/etm.c
View File

@ -320,7 +320,7 @@ int etm_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
LOG_DEBUG("%i", etm_reg->addr); LOG_DEBUG("%i", etm_reg->addr);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(etm_reg->jtag_info, 0x6); arm_jtag_scann(etm_reg->jtag_info, 0x6);
arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL); arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL);
@ -405,7 +405,7 @@ int etm_write_reg(reg_t *reg, u32 value)
LOG_DEBUG("%i: 0x%8.8x", etm_reg->addr, value); LOG_DEBUG("%i: 0x%8.8x", etm_reg->addr, value);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
arm_jtag_scann(etm_reg->jtag_info, 0x6); arm_jtag_scann(etm_reg->jtag_info, 0x6);
arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL); arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL);

2
src/target/feroceon.c
View File

@ -124,7 +124,7 @@ int feroceon_dummy_clock_out(arm_jtag_t *jtag_info, u32 instr)
buf_set_u32(instr_buf, 0, 32, flip_u32(instr, 32)); buf_set_u32(instr_buf, 0, 32, flip_u32(instr, 32));
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
arm_jtag_scann(jtag_info, 0x1); arm_jtag_scann(jtag_info, 0x1);
arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);

6
src/target/mips_ejtag.c
View File

@ -60,7 +60,7 @@ int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode)
{ {
scan_field_t field; scan_field_t field;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IDCODE, NULL); mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IDCODE, NULL);
@ -87,7 +87,7 @@ int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode)
{ {
scan_field_t field; scan_field_t field;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IMPCODE, NULL); mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IMPCODE, NULL);
@ -199,7 +199,7 @@ int mips_ejtag_config_step(mips_ejtag_t *ejtag_info, int enable_step)
int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info) int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info)
{ {
u32 ejtag_ctrl; u32 ejtag_ctrl;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL); mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
/* set debug break bit */ /* set debug break bit */

10
src/target/mips_m4k.c
View File

@ -161,7 +161,7 @@ int mips_m4k_poll(target_t *target)
u32 ejtag_ctrl = ejtag_info->ejtag_ctrl; u32 ejtag_ctrl = ejtag_info->ejtag_ctrl;
/* read ejtag control reg */ /* read ejtag control reg */
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL); mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl); mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
@ -171,7 +171,7 @@ int mips_m4k_poll(target_t *target)
{ {
/* we have detected a reset, clear flag /* we have detected a reset, clear flag
* otherwise ejtag will not work */ * otherwise ejtag will not work */
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_ROCC; ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_ROCC;
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL); mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
@ -184,7 +184,7 @@ int mips_m4k_poll(target_t *target)
{ {
if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET)) if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET))
{ {
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT, NULL); mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT, NULL);
target->state = TARGET_HALTED; target->state = TARGET_HALTED;
@ -276,12 +276,12 @@ int mips_m4k_assert_reset(target_t *target)
if (target->reset_halt) if (target->reset_halt)
{ {
/* use hardware to catch reset */ /* use hardware to catch reset */
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_EJTAGBOOT, NULL); mips_ejtag_set_instr(ejtag_info, EJTAG_INST_EJTAGBOOT, NULL);
} }
else else
{ {
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT, NULL); mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT, NULL);
} }

34
src/target/xscale.c
View File

@ -238,7 +238,7 @@ int xscale_read_dcsr(target_t *target)
u8 field2_check_value = 0x0; u8 field2_check_value = 0x0;
u8 field2_check_mask = 0x1; u8 field2_check_mask = 0x1;
jtag_add_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr); xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr);
buf_set_u32(&field0, 1, 1, xscale->hold_rst); buf_set_u32(&field0, 1, 1, xscale->hold_rst);
@ -283,7 +283,7 @@ int xscale_read_dcsr(target_t *target)
fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value; fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
fields[1].in_value = NULL; fields[1].in_value = NULL;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
jtag_add_dr_scan(3, fields, jtag_get_end_state()); jtag_add_dr_scan(3, fields, jtag_get_end_state());
@ -345,7 +345,7 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
fields[2].check_value = &field2_check_value; fields[2].check_value = &field2_check_value;
fields[2].check_mask = &field2_check_mask; fields[2].check_mask = &field2_check_mask;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx); xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx);
jtag_add_runtest(1, jtag_get_end_state()); /* ensures that we're in the TAP_IDLE state as the above could be a no-op */ jtag_add_runtest(1, jtag_get_end_state()); /* ensures that we're in the TAP_IDLE state as the above could be a no-op */
@ -363,7 +363,7 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
fields[1].in_value = (u8 *)(field1+i); fields[1].in_value = (u8 *)(field1+i);
jtag_add_dr_scan_check(3, fields, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan_check(3, fields, jtag_set_end_state(TAP_IDLE));
jtag_add_callback(xscale_getbuf, (u8 *)(field1+i)); jtag_add_callback(xscale_getbuf, (u8 *)(field1+i));
@ -429,7 +429,7 @@ int xscale_read_tx(target_t *target, int consume)
u8 field2_check_value = 0x0; u8 field2_check_value = 0x0;
u8 field2_check_mask = 0x1; u8 field2_check_mask = 0x1;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx); xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx);
@ -477,7 +477,7 @@ int xscale_read_tx(target_t *target, int consume)
jtag_add_pathmove(sizeof(noconsume_path)/sizeof(*noconsume_path), noconsume_path); jtag_add_pathmove(sizeof(noconsume_path)/sizeof(*noconsume_path), noconsume_path);
} }
jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask); jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask); jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
@ -532,7 +532,7 @@ int xscale_write_rx(target_t *target)
u8 field2_check_value = 0x0; u8 field2_check_value = 0x0;
u8 field2_check_mask = 0x1; u8 field2_check_mask = 0x1;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgrx); xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgrx);
@ -560,7 +560,7 @@ int xscale_write_rx(target_t *target)
LOG_DEBUG("polling RX"); LOG_DEBUG("polling RX");
for (;;) for (;;)
{ {
jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask); jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask); jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
@ -592,7 +592,7 @@ int xscale_write_rx(target_t *target)
/* set rx_valid */ /* set rx_valid */
field2 = 0x1; field2 = 0x1;
jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE)); jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
if ((retval = jtag_execute_queue()) != ERROR_OK) if ((retval = jtag_execute_queue()) != ERROR_OK)
{ {
@ -615,7 +615,7 @@ int xscale_send(target_t *target, u8 *buffer, int count, int size)
int done_count = 0; int done_count = 0;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgrx); xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgrx);
@ -658,7 +658,7 @@ int xscale_send(target_t *target, u8 *buffer, int count, int size)
3, 3,
bits, bits,
t, t,
jtag_add_end_state(TAP_IDLE)); jtag_set_end_state(TAP_IDLE));
buffer += size; buffer += size;
} }
@ -701,7 +701,7 @@ int xscale_write_dcsr(target_t *target, int hold_rst, int ext_dbg_brk)
if (ext_dbg_brk != -1) if (ext_dbg_brk != -1)
xscale->external_debug_break = ext_dbg_brk; xscale->external_debug_break = ext_dbg_brk;
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr); xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr);
buf_set_u32(&field0, 1, 1, xscale->hold_rst); buf_set_u32(&field0, 1, 1, xscale->hold_rst);
@ -766,7 +766,7 @@ int xscale_load_ic(target_t *target, int mini, u32 va, u32 buffer[8])
LOG_DEBUG("loading miniIC at 0x%8.8x", va); LOG_DEBUG("loading miniIC at 0x%8.8x", va);
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.ldic); /* LDIC */ xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.ldic); /* LDIC */
/* CMD is b010 for Main IC and b011 for Mini IC */ /* CMD is b010 for Main IC and b011 for Mini IC */
@ -833,7 +833,7 @@ int xscale_invalidate_ic_line(target_t *target, u32 va)
scan_field_t fields[2]; scan_field_t fields[2];
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.ldic); /* LDIC */ xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.ldic); /* LDIC */
/* CMD for invalidate IC line b000, bits [6:4] b000 */ /* CMD for invalidate IC line b000, bits [6:4] b000 */
@ -1572,7 +1572,7 @@ int xscale_assert_reset(target_t *target)
/* select DCSR instruction (set endstate to R-T-I to ensure we don't /* select DCSR instruction (set endstate to R-T-I to ensure we don't
* end up in T-L-R, which would reset JTAG * end up in T-L-R, which would reset JTAG
*/ */
jtag_add_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr); xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr);
/* set Hold reset, Halt mode and Trap Reset */ /* set Hold reset, Halt mode and Trap Reset */
@ -1646,7 +1646,7 @@ int xscale_deassert_reset(target_t *target)
/* wait 300ms; 150 and 100ms were not enough */ /* wait 300ms; 150 and 100ms were not enough */
jtag_add_sleep(300*1000); jtag_add_sleep(300*1000);
jtag_add_runtest(2030, jtag_add_end_state(TAP_IDLE)); jtag_add_runtest(2030, jtag_set_end_state(TAP_IDLE));
jtag_execute_queue(); jtag_execute_queue();
/* set Hold reset, Halt mode and Trap Reset */ /* set Hold reset, Halt mode and Trap Reset */
@ -1709,7 +1709,7 @@ int xscale_deassert_reset(target_t *target)
xscale_load_ic(target, 1, 0x0, xscale->low_vectors); xscale_load_ic(target, 1, 0x0, xscale->low_vectors);
xscale_load_ic(target, 1, 0xffff0000, xscale->high_vectors); xscale_load_ic(target, 1, 0xffff0000, xscale->high_vectors);
jtag_add_runtest(30, jtag_add_end_state(TAP_IDLE)); jtag_add_runtest(30, jtag_set_end_state(TAP_IDLE));
jtag_add_sleep(100000); jtag_add_sleep(100000);

8
src/xsvf/xsvf.c
View File

@ -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); field.in_value = calloc(CEIL(field.num_bits, 8), 1);
if (tap == NULL) if (tap == NULL)
jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
else else
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
jtag_check_value_mask(&field, dr_in_buf, dr_in_mask); 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); LOG_USER("LSDR retry %d", attempt);
if (tap == NULL) if (tap == NULL)
jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
else else
jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
jtag_check_value_mask(&field, dr_in_buf, dr_in_mask); jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);