diff options
Diffstat (limited to 'src/target/arm_jtag.h')
| -rw-r--r-- | src/target/arm_jtag.h | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h index e90abfe0..d22deae1 100644 --- a/src/target/arm_jtag.h +++ b/src/target/arm_jtag.h @@ -20,13 +20,13 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef ARM_JTAG #define ARM_JTAG #include <jtag/jtag.h> -struct arm_jtag -{ +struct arm_jtag { struct jtag_tap *tap; uint32_t scann_size; @@ -39,53 +39,46 @@ struct arm_jtag int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, void *no_verify_capture, tap_state_t end_state); + static inline int arm_jtag_set_instr(struct arm_jtag *jtag_info, uint32_t new_instr, void *no_verify_capture, tap_state_t end_state) { /* inline most common code path */ struct jtag_tap *tap; tap = jtag_info->tap; - assert (tap != NULL); + assert(tap != NULL); if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) - { return arm_jtag_set_instr_inner(jtag_info, new_instr, no_verify_capture, end_state); - } return ERROR_OK; } - int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state); static inline int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state) { /* inline most common code path */ int retval = ERROR_OK; if (jtag_info->cur_scan_chain != new_scan_chain) - { return arm_jtag_scann_inner(jtag_info, new_scan_chain, end_state); - } return retval; } - int arm_jtag_setup_connection(struct arm_jtag *jtag_info); /* use this as a static so we can inline it in -O3 and refer to it via a pointer */ -static __inline__ void arm7flip32(jtag_callback_data_t arg) +static inline void arm7flip32(jtag_callback_data_t arg) { - uint8_t *in = (uint8_t *)arg; - *((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32); + uint8_t *in = (uint8_t *)arg; + *((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32); } -static __inline__ void arm_le_to_h_u32(jtag_callback_data_t arg) +static inline void arm_le_to_h_u32(jtag_callback_data_t arg) { - uint8_t *in = (uint8_t *)arg; - *((uint32_t *)arg) = le_to_h_u32(in); + uint8_t *in = (uint8_t *)arg; + *((uint32_t *)arg) = le_to_h_u32(in); } - #endif /* ARM_JTAG */ - |