diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-07 13:23:14 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-07 13:23:14 +0000 |
| commit | 7eeb3cfc47b8b6337453063e05dbf52a8ce7191e (patch) | |
| tree | 98fda47105bc1c6808204ed8eaf4cf1f3c27202e /src/target | |
| parent | c4ee880715121ccfb2ad960673d0f5e603c60d3d (diff) | |
| download | openocd+libswd-7eeb3cfc47b8b6337453063e05dbf52a8ce7191e.tar.gz openocd+libswd-7eeb3cfc47b8b6337453063e05dbf52a8ce7191e.tar.bz2 openocd+libswd-7eeb3cfc47b8b6337453063e05dbf52a8ce7191e.tar.xz openocd+libswd-7eeb3cfc47b8b6337453063e05dbf52a8ce7191e.zip | |
stop using in_handler
git-svn-id: svn://svn.berlios.de/openocd/trunk@1639 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target')
| -rw-r--r-- | src/target/arm11_dbgtap.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c index d897f108..1df791d3 100644 --- a/src/target/arm11_dbgtap.c +++ b/src/target/arm11_dbgtap.c @@ -130,7 +130,7 @@ void arm11_add_IR(arm11_common_t * arm11, u8 instr, tap_state_t state) * 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() */ 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) { 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); - return ERROR_OK; } /** 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; - arm11_setup_field(arm11, 5, &chain, NULL, &field); - - field.in_handler = arm11_in_handler_SCAN_N; /* deprecated! invoke this from user code! */ + u8 tmp[1]; + arm11_setup_field(arm11, 5, &chain, &tmp, &field); 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 |