X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fjtag.h;h=e190858a9e47ac46fc5648125820c334c6cc5874;hb=bdbc833bacd6b78612806393cf0122ea702221e2;hp=f70c1ead8d31243d535810c145d1d321ae0f0eec;hpb=3fe23f94fb71d838eb86dd7bdeb9e67216b6e801;p=openocd.git diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index f70c1ead8d..e190858a9e 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -77,12 +77,13 @@ typedef struct scan_field_s u8 *out_mask; /* only masked bits care */ u8 *in_value; /* pointer to a 32-bit memory location to take data scanned out */ /* in_check_value/mask, in_handler_error_handler, in_handler_priv can be used by the in handler, otherwise they contain garbage */ - u8 *in_check_value; /* used to validate scan results */ - u8 *in_check_mask; /* check specified bits against check_value */ + u8 *in_check_value; /* used to validate scan results */ + u8 *in_check_mask; /* check specified bits against check_value */ in_handler_t in_handler; /* process received buffer using this handler */ void *in_handler_priv; /* additional information for the in_handler */ } scan_field_t; + enum scan_type { /* IN: from device to host, OUT: from host to device */ @@ -222,7 +223,6 @@ extern jtag_interface_t *jtag; /* global pointer to configured JTAG interface */ extern enum tap_state end_state; extern enum tap_state cur_state; -extern char* jtag_interface; extern int jtag_speed; enum reset_types @@ -244,26 +244,51 @@ extern int jtag_init(struct command_context_s *cmd_ctx); extern int jtag_register_commands(struct command_context_s *cmd_ctx); /* JTAG interface, can be implemented with a software or hardware fifo */ -extern int jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_state endstate, void *dummy_anachronism); -extern int jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_state endstate, void *dummy_anachronism); -extern int jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum tap_state endstate, void *dummy_anachronism); -extern int jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum tap_state endstate, void *dummy_anachronism); -/* execute a state transition within the JTAG standard, but nothing is defined - * w.r.t. the path that is taken. Many implementations use precisely +extern int jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); +extern int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); +extern int jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); +extern int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); +extern int jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); +extern int interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); +extern int jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); +extern int interface_jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); +/* execute a state transition within the JTAG standard, but the exact path + * path that is taken is undefined. Many implementations use precisely * 7 clocks to perform a transition, but it could be more or less * than that. - */ + * + * The following assertions are made about certain common state moves: + * + * - A state move from Pause-[ID]R to Pause-[ID]R should always go through + * Update-[ID]R and Capture-[ID]R before returning to Pause-[ID]R, otherwise + * there's no way force a register update, if you can't go to Run-Test/Idle for + * some reason. + * + * - A state move from Pause-[ID]R to Shift-[ID]R must not go through + * Update-[ID]R. + * + * - Run-Test/Idle must not be entered unless requested, because R-T/I may have + * side effects. + */ extern int jtag_add_statemove(enum tap_state endstate); +extern int interface_jtag_add_statemove(enum tap_state endstate); /* A list of unambigious single clock state transitions, not * all drivers can support this, but it is required for e.g. * XScale and Xilinx support + * + * Note! TAP_TLR must not be used in the path! */ extern int jtag_add_pathmove(int num_states, enum tap_state *path); +extern int interface_jtag_add_pathmove(int num_states, enum tap_state *path); /* cycle precisely num_cycles in the TAP_RTI state */ extern int jtag_add_runtest(int num_cycles, enum tap_state endstate); +extern int interface_jtag_add_runtest(int num_cycles, enum tap_state endstate); extern int jtag_add_reset(int trst, int srst); +extern int interface_jtag_add_reset(int trst, int srst); extern int jtag_add_end_state(enum tap_state endstate); +extern int interface_jtag_add_end_state(enum tap_state endstate); extern int jtag_add_sleep(u32 us); +extern int interface_jtag_add_sleep(u32 us); /* * For software FIFO implementations, the queued commands can be executed * during this call or earlier. A sw queue might decide to push out @@ -285,6 +310,8 @@ extern int jtag_add_sleep(u32 us); * at some time between the jtag_add_xxx() fn call and jtag_execute_queue(). */ extern int jtag_execute_queue(void); +/* can be implemented by hw+sw */ +extern int interface_jtag_execute_queue(void); /* JTAG support functions */ extern void jtag_set_check_value(scan_field_t *field, u8 *value, u8 *mask, error_handler_t *in_error_handler); @@ -311,4 +338,6 @@ extern int jtag_verify_capture_ir; #define ERROR_JTAG_RESET_WOULD_ASSERT_TRST (-105) #define ERROR_JTAG_RESET_CANT_SRST (-106) #define ERROR_JTAG_DEVICE_ERROR (-107) + + #endif /* JTAG_H */