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

stop using in_handler 

git-svn-id: svn://svn.berlios.de/openocd/trunk@1639 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-05-07 13:23:14 +00:00
parent c4ee880715
commit 7eeb3cfc47
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/target/arm11_dbgtap.c
View File

@ -130,7 +130,7 @@ void arm11_add_IR(arm11_common_t * arm11, u8 instr, tap_state_t state)
* arm11_add_debug_SCAN_N(). * arm11_add_debug_SCAN_N().
* *
*/ */
static int arm11_in_handler_SCAN_N(u8 *in_value, void *priv, struct scan_field_s *field) static void arm11_in_handler_SCAN_N(u8 *in_value)
{ {
/** \todo TODO: clarify why this isnt properly masked in jtag.c jtag_read_buffer() */ /** \todo TODO: clarify why this isnt properly masked in jtag.c jtag_read_buffer() */
u8 v = *in_value & 0x1F; u8 v = *in_value & 0x1F;
@ -138,11 +138,10 @@ static int arm11_in_handler_SCAN_N(u8 *in_value, void *priv, struct scan_field_s
if (v != 0x10) if (v != 0x10)
{ {
LOG_ERROR("'arm11 target' JTAG communication error SCREG SCAN OUT 0x%02x (expected 0x10)", v); LOG_ERROR("'arm11 target' JTAG communication error SCREG SCAN OUT 0x%02x (expected 0x10)", v);
return ERROR_FAIL; jtag_set_error(ERROR_FAIL);
} }
JTAG_DEBUG("SCREG SCAN OUT 0x%02x", v); JTAG_DEBUG("SCREG SCAN OUT 0x%02x", v);
return ERROR_OK;
} }
/** Select and write to Scan Chain Register (SCREG) /** Select and write to Scan Chain Register (SCREG)
@ -177,11 +176,14 @@ void arm11_add_debug_SCAN_N(arm11_common_t * arm11, u8 chain, tap_state_t state)
scan_field_t field; scan_field_t field;
arm11_setup_field(arm11, 5, &chain, NULL, &field); u8 tmp[1];
arm11_setup_field(arm11, 5, &chain, &tmp, &field);
field.in_handler = arm11_in_handler_SCAN_N; /* deprecated! invoke this from user code! */
arm11_add_dr_scan_vc(1, &field, state == ARM11_TAP_DEFAULT ? TAP_DRPAUSE : state); arm11_add_dr_scan_vc(1, &field, state == ARM11_TAP_DEFAULT ? TAP_DRPAUSE : state);
jtag_execute_queue_noclear();
arm11_in_handler_SCAN_N(tmp); /* deprecated! invoke this from user code! */
} }
/** Write an instruction into the ITR register /** Write an instruction into the ITR register