summaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-11 09:06:00 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-11 09:06:00 +0000
commit9a9cc91bcb61e340ba60b46dedb9017a58c8c91a (patch)
tree7320592f80e39038b77000aa74207ddedff3b5d8 /src/target
parent970e16603bde0a4c5334e5eb3c81264830b55798 (diff)
downloadopenocd+libswd-9a9cc91bcb61e340ba60b46dedb9017a58c8c91a.tar.gz
openocd+libswd-9a9cc91bcb61e340ba60b46dedb9017a58c8c91a.tar.bz2
openocd+libswd-9a9cc91bcb61e340ba60b46dedb9017a58c8c91a.tar.xz
openocd+libswd-9a9cc91bcb61e340ba60b46dedb9017a58c8c91a.zip
- fixed jtag_add_reset(). It no longer causes jtag_execute_queue() to
fail for two of it's return codes. A little bit weird, but compatible with existing codebase. - tightend up error handling. Since the jtag_xxx() is a queue that is either executed as things are added(hw queue) or a software queue, then errors can only be caught during jtag_execute_queue(). No error code is therefore returned from the queuing fn's. git-svn-id: svn://svn.berlios.de/openocd/trunk@492 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target')
-rw-r--r--src/target/arm11_dbgtap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 8eeba797..fa17ac7e 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -45,7 +45,8 @@ int arm11_add_ir_scan_vc(int num_fields, scan_field_t *fields, enum tap_state st
if (cmd_queue_cur_state == TAP_PI)
jtag_add_pathmove(asizeof(arm11_move_pi_to_si_via_ci), arm11_move_pi_to_si_via_ci);
- return jtag_add_ir_scan(num_fields, fields, state);
+ jtag_add_ir_scan(num_fields, fields, state);
+ return ERROR_OK;
}
enum tap_state arm11_move_pd_to_sd_via_cd[] =
@@ -58,7 +59,8 @@ int arm11_add_dr_scan_vc(int num_fields, scan_field_t *fields, enum tap_state st
if (cmd_queue_cur_state == TAP_PD)
jtag_add_pathmove(asizeof(arm11_move_pd_to_sd_via_cd), arm11_move_pd_to_sd_via_cd);
- return jtag_add_dr_scan(num_fields, fields, state);
+ jtag_add_dr_scan(num_fields, fields, state);
+ return ERROR_OK;
}