X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fusbprog.c;h=816668855dcc84206cd7dd73c97249b8eae9e03d;hb=7d6b4b42f61debb058013c4179f29f7fa09d8548;hp=665c60700350aad673d94ca15a3f6cc133e6b6ee;hpb=bcde5b3830147c131afacf836cb24698039b9f84;p=openocd.git diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c index 665c607003..816668855d 100644 --- a/src/jtag/usbprog.c +++ b/src/jtag/usbprog.c @@ -47,10 +47,10 @@ #define PID 0x0c63 /* Pins at usbprog */ -#define TDO_BIT 0 -#define TDI_BIT 3 -#define TCK_BIT 2 -#define TMS_BIT 1 +#define TDO_BIT 0 +#define TDI_BIT 3 +#define TCK_BIT 2 +#define TMS_BIT 1 int usbprog_execute_queue(void); int usbprog_speed(int speed); @@ -58,7 +58,7 @@ int usbprog_register_commands(struct command_context_s *cmd_ctx); int usbprog_init(void); int usbprog_quit(void); -void usbprog_end_state(enum tap_state state); +void usbprog_end_state(tap_state_t state); void usbprog_state_move(void); void usbprog_path_move(pathmove_command_t *cmd); void usbprog_runtest(int num_cycles); @@ -74,17 +74,17 @@ jtag_interface_t usbprog_interface = .quit = usbprog_quit }; -#define UNKOWN_COMMAND 0x00 -#define PORT_DIRECTION 0x01 -#define PORT_SET 0x02 -#define PORT_GET 0x03 -#define PORT_SETBIT 0x04 -#define PORT_GETBIT 0x05 -#define WRITE_TDI 0x06 -#define READ_TDO 0x07 -#define WRITE_AND_READ 0x08 -#define WRITE_TMS 0x09 -#define WRITE_TMS_CHAIN 0x0A +#define UNKOWN_COMMAND 0x00 +#define PORT_DIRECTION 0x01 +#define PORT_SET 0x02 +#define PORT_GET 0x03 +#define PORT_SETBIT 0x04 +#define PORT_GETBIT 0x05 +#define WRITE_TDI 0x06 +#define READ_TDO 0x07 +#define WRITE_AND_READ 0x08 +#define WRITE_TMS 0x09 +#define WRITE_TMS_CHAIN 0x0A struct usbprog_jtag { @@ -93,7 +93,7 @@ struct usbprog_jtag struct usbprog_jtag * usbprog_jtag_handle; -struct usbprog_jtag* usbprog_jtag_open(); +struct usbprog_jtag* usbprog_jtag_open(void); void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag); void usbprog_jtag_init(struct usbprog_jtag *usbprog_jtag); unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen); @@ -142,7 +142,7 @@ int usbprog_execute_queue(void) #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("end_state: %i", cmd->cmd.end_state->end_state); #endif - if (cmd->cmd.end_state->end_state != -1) + if (cmd->cmd.end_state->end_state != TAP_INVALID) usbprog_end_state(cmd->cmd.end_state->end_state); break; case JTAG_RESET: @@ -151,7 +151,7 @@ int usbprog_execute_queue(void) #endif if (cmd->cmd.reset->trst == 1) { - cur_state = TAP_RESET; + tap_set_state(TAP_RESET); } usbprog_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; @@ -159,7 +159,7 @@ int usbprog_execute_queue(void) #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, cmd->cmd.runtest->end_state); #endif - if (cmd->cmd.runtest->end_state != -1) + if (cmd->cmd.runtest->end_state != TAP_INVALID) usbprog_end_state(cmd->cmd.runtest->end_state); usbprog_runtest(cmd->cmd.runtest->num_cycles); break; @@ -167,7 +167,7 @@ int usbprog_execute_queue(void) #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state); #endif - if (cmd->cmd.statemove->end_state != -1) + if (cmd->cmd.statemove->end_state != TAP_INVALID) usbprog_end_state(cmd->cmd.statemove->end_state); usbprog_state_move(); break; @@ -182,7 +182,7 @@ int usbprog_execute_queue(void) #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("scan end in %i", cmd->cmd.scan->end_state); #endif - if (cmd->cmd.scan->end_state != -1) + if (cmd->cmd.scan->end_state != TAP_INVALID) usbprog_end_state(cmd->cmd.scan->end_state); scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer); type = jtag_scan_type(cmd->cmd.scan); @@ -235,10 +235,10 @@ int usbprog_quit(void) } /*************** jtag execute commands **********************/ -void usbprog_end_state(enum tap_state state) +void usbprog_end_state(tap_state_t state) { - if (tap_move_map[state] != -1) - end_state = state; + if (tap_is_state_stable(state)) + tap_set_end_state(state); else { LOG_ERROR("BUG: %i is not a valid end state", state); @@ -249,7 +249,7 @@ void usbprog_end_state(enum tap_state state) void usbprog_state_move(void) { int i = 0, tms = 0; - u8 tms_scan = TAP_MOVE(cur_state, end_state); + u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state()); usbprog_jtag_write_tms(usbprog_jtag_handle, (char)tms_scan); for (i = 0; i < 7; i++) @@ -257,7 +257,7 @@ void usbprog_state_move(void) tms = (tms_scan >> i) & 1; } - cur_state = end_state; + tap_set_state(tap_get_end_state()); } void usbprog_path_move(pathmove_command_t *cmd) @@ -268,13 +268,13 @@ void usbprog_path_move(pathmove_command_t *cmd) state_count = 0; while (num_states) { - if (tap_transitions[cur_state].low == cmd->path[state_count]) + if (tap_state_transition(tap_get_state(), false) == cmd->path[state_count]) { /* LOG_INFO("1"); */ usbprog_write(0, 0, 0); usbprog_write(1, 0, 0); } - else if (tap_transitions[cur_state].high == cmd->path[state_count]) + else if (tap_state_transition(tap_get_state(), true) == cmd->path[state_count]) { /* LOG_INFO("2"); */ usbprog_write(0, 1, 0); @@ -282,16 +282,16 @@ void usbprog_path_move(pathmove_command_t *cmd) } else { - LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[state_count]]); + LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(tap_get_state()), tap_state_name(cmd->path[state_count])); exit(-1); } - cur_state = cmd->path[state_count]; + tap_set_state(cmd->path[state_count]); state_count++; num_states--; } - end_state = cur_state; + tap_set_end_state(tap_get_state()); } void usbprog_runtest(int num_cycles) @@ -299,7 +299,7 @@ void usbprog_runtest(int num_cycles) int i; /* only do a state_move when we're not already in IDLE */ - if (cur_state != TAP_IDLE) + if (tap_get_state() != TAP_IDLE) { usbprog_end_state(TAP_IDLE); usbprog_state_move(); @@ -326,14 +326,14 @@ void usbprog_runtest(int num_cycles) /* finish in end_state */ /* usbprog_end_state(saved_end_state); - if (cur_state != end_state) + if (tap_get_state() != tap_get_end_state()) usbprog_state_move(); */ } void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) { - enum tap_state saved_end_state = end_state; + tap_state_t saved_end_state = tap_get_end_state(); if (ir_scan) usbprog_end_state(TAP_IRSHIFT); @@ -347,25 +347,23 @@ void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) usbprog_jtag_tms_send(usbprog_jtag_handle); - if (type == SCAN_OUT) - { - usbprog_jtag_write_tdi(usbprog_jtag_handle,buffer, scan_size); - } - if (type == SCAN_IN) - { - usbprog_jtag_read_tdo(usbprog_jtag_handle,buffer, scan_size); - } - if (type == SCAN_IO) - { - usbprog_jtag_write_and_read(usbprog_jtag_handle,buffer, scan_size); + void (*f)(struct usbprog_jtag *usbprog_jtag, char * buffer, int size); + switch (type) { + case SCAN_OUT: f = &usbprog_jtag_write_tdi; break; + case SCAN_IN: f = &usbprog_jtag_read_tdo; break; + case SCAN_IO: f = &usbprog_jtag_write_and_read; break; + default: + LOG_ERROR("unknown scan type: %i", type); + exit(-1); } + f(usbprog_jtag_handle, (char *)buffer, scan_size); if (ir_scan) - cur_state = TAP_IRPAUSE; + tap_set_state(TAP_IRPAUSE); else - cur_state = TAP_DRPAUSE; + tap_set_state(TAP_DRPAUSE); - if (cur_state != end_state) + if (tap_get_state() != tap_get_end_state()) usbprog_state_move(); } @@ -405,7 +403,7 @@ void usbprog_reset(int trst, int srst) struct usb_bus *busses; -struct usbprog_jtag* usbprog_jtag_open() +struct usbprog_jtag* usbprog_jtag_open(void) { struct usb_bus *bus; struct usb_device *dev;