X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=3a552eebad110cfbff1f21a7809c186589b439b6;hb=e6d979eefcc99aeb3f95fab67598af461ef234c1;hp=d975d9d01725e05a8b0d0f2a07e74ee46094f4e7;hpb=8b994145b849c40b0a195c3fb332b9770b2f9097;p=openocd.git diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c index d975d9d017..3a552eebad 100644 --- a/src/target/arm_jtag.c +++ b/src/target/arm_jtag.c @@ -31,72 +31,60 @@ #define _ARM_JTAG_SCAN_N_CHECK_ #endif -int arm_jtag_set_instr(arm_jtag_t *jtag_info, uint32_t new_instr, void *no_verify_capture) +int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, void *no_verify_capture, tap_state_t end_state) { - jtag_tap_t *tap; + struct jtag_tap *tap; tap = jtag_info->tap; - if (tap == NULL) - return ERROR_FAIL; + struct scan_field field; + uint8_t t[4]; - if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) + field.num_bits = tap->ir_length; + field.out_value = t; + buf_set_u32(t, 0, field.num_bits, new_instr); + field.in_value = NULL; + + if (no_verify_capture == NULL) + { + jtag_add_ir_scan(tap, &field, end_state); + } else { - scan_field_t field; - uint8_t t[4]; - - field.tap = tap; - field.num_bits = tap->ir_length; - field.out_value = t; - buf_set_u32(field.out_value, 0, field.num_bits, new_instr); - field.in_value = NULL; - - - - if (no_verify_capture == NULL) - { - jtag_add_ir_scan(1, &field, jtag_get_end_state()); - } else - { - /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to - * have special verification code. - */ - jtag_add_ir_scan_noverify(1, &field, jtag_get_end_state()); - } + /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to + * have special verification code. + */ + jtag_add_ir_scan_noverify(tap, &field, end_state); } return ERROR_OK; } -int arm_jtag_scann(arm_jtag_t *jtag_info, uint32_t new_scan_chain) +int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state) { int retval = ERROR_OK; - if (jtag_info->cur_scan_chain != new_scan_chain) - { - uint32_t values[1]; - int num_bits[1]; + uint32_t values[1]; + int num_bits[1]; - values[0]=new_scan_chain; - num_bits[0]=jtag_info->scann_size; + values[0]=new_scan_chain; + num_bits[0]=jtag_info->scann_size; - if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL)) != ERROR_OK) - { - return retval; - } + if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state)) != ERROR_OK) + { + return retval; + } - jtag_add_dr_out(jtag_info->tap, - 1, - num_bits, - values, - jtag_get_end_state()); + jtag_add_dr_out(jtag_info->tap, + 1, + num_bits, + values, + end_state); - jtag_info->cur_scan_chain = new_scan_chain; - } + jtag_info->cur_scan_chain = new_scan_chain; return retval; } -int arm_jtag_reset_callback(enum jtag_event event, void *priv) +static int arm_jtag_reset_callback(enum jtag_event event, void *priv) { - arm_jtag_t *jtag_info = priv; + struct arm_jtag *jtag_info = priv; if (event == JTAG_TRST_ASSERTED) { @@ -106,7 +94,7 @@ int arm_jtag_reset_callback(enum jtag_event event, void *priv) return ERROR_OK; } -int arm_jtag_setup_connection(arm_jtag_t *jtag_info) +int arm_jtag_setup_connection(struct arm_jtag *jtag_info) { jtag_info->scann_instr = 0x2; jtag_info->cur_scan_chain = 0; @@ -114,92 +102,3 @@ int arm_jtag_setup_connection(arm_jtag_t *jtag_info) return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info); } - -/* read JTAG buffer into host-endian uint32_t, flipping bit-order */ -int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - uint32_t *dest = priv; - *dest = flip_u32(le_to_h_u32(in_buf), 32); - return ERROR_OK; -} - -/* read JTAG buffer into little-endian uint32_t, flipping bit-order */ -int arm_jtag_buf_to_le32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - h_u32_to_le(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32)); - return ERROR_OK; -} - -/* read JTAG buffer into little-endian uint16_t, flipping bit-order */ -int arm_jtag_buf_to_le16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - h_u16_to_le(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff); - return ERROR_OK; -} - -/* read JTAG buffer into big-endian uint32_t, flipping bit-order */ -int arm_jtag_buf_to_be32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - h_u32_to_be(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32)); - return ERROR_OK; -} - -/* read JTAG buffer into big-endian uint16_t, flipping bit-order */ -int arm_jtag_buf_to_be16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - h_u16_to_be(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff); - return ERROR_OK; -} - -/* read JTAG buffer into uint8_t, flipping bit-order */ -int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - uint8_t *dest = priv; - *dest = flip_u32(le_to_h_u32(in_buf), 32) & 0xff; - return ERROR_OK; -} - -/* not-flipping variants */ -/* read JTAG buffer into host-endian uint32_t */ -int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - uint32_t *dest = priv; - *dest = le_to_h_u32(in_buf); - return ERROR_OK; -} - -/* read JTAG buffer into little-endian uint32_t */ -int arm_jtag_buf_to_le32(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - h_u32_to_le(((uint8_t*)priv), le_to_h_u32(in_buf)); - return ERROR_OK; -} - -/* read JTAG buffer into little-endian uint16_t */ -int arm_jtag_buf_to_le16(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - h_u16_to_le(((uint8_t*)priv), le_to_h_u32(in_buf) & 0xffff); - return ERROR_OK; -} - -/* read JTAG buffer into big-endian uint32_t */ -int arm_jtag_buf_to_be32(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - h_u32_to_be(((uint8_t*)priv), le_to_h_u32(in_buf)); - return ERROR_OK; -} - -/* read JTAG buffer into big-endian uint16_t */ -int arm_jtag_buf_to_be16(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - h_u16_to_be(((uint8_t*)priv), le_to_h_u32(in_buf) & 0xffff); - return ERROR_OK; -} - -/* read JTAG buffer into uint8_t */ -int arm_jtag_buf_to_8(uint8_t *in_buf, void *priv, struct scan_field_s *field) -{ - uint8_t *dest = priv; - *dest = le_to_h_u32(in_buf) & 0xff; - return ERROR_OK; -}