From e3462b228ce9533b6e7989361f9c4090043a8aa4 Mon Sep 17 00:00:00 2001 From: oharboe Date: Wed, 19 Nov 2008 08:22:47 +0000 Subject: jtag_get_device() now returns NULL and reports error instead of invoking exit() git-svn-id: svn://svn.berlios.de/openocd/trunk@1176 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/arm_jtag.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/target/arm_jtag.c') diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c index 9452c2b9..2967f088 100644 --- a/src/target/arm_jtag.c +++ b/src/target/arm_jtag.c @@ -39,12 +39,14 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr, in_handler_t handler) { jtag_device_t *device = jtag_get_device(jtag_info->chain_pos); - + if (device==NULL) + return ERROR_FAIL; + if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr) { scan_field_t field; u8 t[4]; - + field.device = jtag_info->chain_pos; field.num_bits = device->ir_length; field.out_value = t; @@ -57,7 +59,7 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr, in_handler_t handl field.in_handler_priv = NULL; jtag_add_ir_scan(1, &field, -1); } - + return ERROR_OK; } @@ -68,7 +70,7 @@ int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain) { u32 values[1]; int num_bits[1]; - + values[0]=new_scan_chain; num_bits[0]=jtag_info->scann_size; @@ -82,7 +84,7 @@ int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain) num_bits, values, -1); - + jtag_info->cur_scan_chain = new_scan_chain; } @@ -92,12 +94,12 @@ int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain) int arm_jtag_reset_callback(enum jtag_event event, void *priv) { arm_jtag_t *jtag_info = priv; - + if (event == JTAG_TRST_ASSERTED) { jtag_info->cur_scan_chain = 0; } - + return ERROR_OK; } -- cgit v1.2.3