X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fusbprog.c;h=5d9c71b5a7ddf458e7b769c2f9f6860b31fc00d9;hp=816668855dcc84206cd7dd73c97249b8eae9e03d;hb=c18947b947064e7eceed8047c42d4c8dfd8ae964;hpb=7d6b4b42f61debb058013c4179f29f7fa09d8548 diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c index 816668855d..5d9c71b5a7 100644 --- a/src/jtag/usbprog.c +++ b/src/jtag/usbprog.c @@ -34,14 +34,11 @@ #include "config.h" #endif -#include "replacements.h" +#include "interface.h" +#include "commands.h" -#include "jtag.h" #include -/* system includes */ - -#include "log.h" #define VID 0x1781 #define PID 0x0c63 @@ -52,17 +49,17 @@ #define TCK_BIT 2 #define TMS_BIT 1 -int usbprog_execute_queue(void); -int usbprog_speed(int speed); -int usbprog_register_commands(struct command_context_s *cmd_ctx); -int usbprog_init(void); -int usbprog_quit(void); +static int usbprog_execute_queue(void); +static int usbprog_speed(int speed); +static int usbprog_register_commands(struct command_context_s *cmd_ctx); +static int usbprog_init(void); +static int usbprog_quit(void); -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); -void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size); +static void usbprog_end_state(tap_state_t state); +static void usbprog_state_move(void); +static void usbprog_path_move(pathmove_command_t *cmd); +static void usbprog_runtest(int num_cycles); +static void usbprog_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size); jtag_interface_t usbprog_interface = { @@ -91,60 +88,54 @@ struct usbprog_jtag struct usb_dev_handle* usb_handle; }; -struct usbprog_jtag * usbprog_jtag_handle; +static struct usbprog_jtag * usbprog_jtag_handle; + +static struct usbprog_jtag* usbprog_jtag_open(void); +//static void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag); +static void usbprog_jtag_init(struct usbprog_jtag *usbprog_jtag); +static unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen); -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); +static void usbprog_jtag_read_tdo(struct usbprog_jtag *usbprog_jtag, char * buffer, int size); +static void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char * buffer, int size); +static void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char * buffer, int size); +static void usbprog_jtag_write_tms(struct usbprog_jtag *usbprog_jtag, char tms_scan); -void usbprog_jtag_read_tdo(struct usbprog_jtag *usbprog_jtag, char * buffer, int size); -void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char * buffer, int size); -void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char * buffer, int size); -void usbprog_jtag_write_tms(struct usbprog_jtag *usbprog_jtag, char tms_scan); +static char tms_chain[64]; +static int tms_chain_index; -char tms_chain[64]; -int tms_chain_index; -void usbprog_jtag_tms_collect(char tms_scan); -void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag); +static void usbprog_jtag_tms_collect(char tms_scan); +static void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag); -void usbprog_write(int tck, int tms, int tdi); -void usbprog_reset(int trst, int srst); +static void usbprog_write(int tck, int tms, int tdi); +static void usbprog_reset(int trst, int srst); -void usbprog_jtag_set_direction(struct usbprog_jtag *usbprog_jtag, unsigned char direction); -void usbprog_jtag_write_slice(struct usbprog_jtag *usbprog_jtag,unsigned char value); -unsigned char usbprog_jtag_get_port(struct usbprog_jtag *usbprog_jtag); -void usbprog_jtag_set_bit(struct usbprog_jtag *usbprog_jtag,int bit, int value); -int usbprog_jtag_get_bit(struct usbprog_jtag *usbprog_jtag, int bit); +static void usbprog_jtag_set_direction(struct usbprog_jtag *usbprog_jtag, unsigned char direction); +static void usbprog_jtag_write_slice(struct usbprog_jtag *usbprog_jtag,unsigned char value); +//static unsigned char usbprog_jtag_get_port(struct usbprog_jtag *usbprog_jtag); +static void usbprog_jtag_set_bit(struct usbprog_jtag *usbprog_jtag,int bit, int value); +//static int usbprog_jtag_get_bit(struct usbprog_jtag *usbprog_jtag, int bit); -int usbprog_speed(int speed) +static int usbprog_speed(int speed) { return ERROR_OK; } -int usbprog_register_commands(struct command_context_s *cmd_ctx) +static int usbprog_register_commands(struct command_context_s *cmd_ctx) { return ERROR_OK; } -int usbprog_execute_queue(void) +static int usbprog_execute_queue(void) { jtag_command_t *cmd = jtag_command_queue; /* currently processed command */ int scan_size; enum scan_type type; - u8 *buffer; + uint8_t *buffer; while (cmd) { switch (cmd->type) { - case JTAG_END_STATE: -#ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("end_state: %i", cmd->cmd.end_state->end_state); -#endif - if (cmd->cmd.end_state->end_state != TAP_INVALID) - usbprog_end_state(cmd->cmd.end_state->end_state); - break; case JTAG_RESET: #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst); @@ -159,16 +150,14 @@ 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 != TAP_INVALID) - usbprog_end_state(cmd->cmd.runtest->end_state); + usbprog_end_state(cmd->cmd.runtest->end_state); usbprog_runtest(cmd->cmd.runtest->num_cycles); break; case JTAG_STATEMOVE: #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state); #endif - if (cmd->cmd.statemove->end_state != TAP_INVALID) - usbprog_end_state(cmd->cmd.statemove->end_state); + usbprog_end_state(cmd->cmd.statemove->end_state); usbprog_state_move(); break; case JTAG_PATHMOVE: @@ -182,8 +171,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 != TAP_INVALID) - usbprog_end_state(cmd->cmd.scan->end_state); + usbprog_end_state(cmd->cmd.scan->end_state); scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer); type = jtag_scan_type(cmd->cmd.scan); usbprog_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size); @@ -209,7 +197,7 @@ int usbprog_execute_queue(void) return ERROR_OK; } -int usbprog_init(void) +static int usbprog_init(void) { usbprog_jtag_handle = usbprog_jtag_open(); @@ -229,13 +217,13 @@ int usbprog_init(void) return ERROR_OK; } -int usbprog_quit(void) +static int usbprog_quit(void) { return ERROR_OK; } /*************** jtag execute commands **********************/ -void usbprog_end_state(tap_state_t state) +static void usbprog_end_state(tap_state_t state) { if (tap_is_state_stable(state)) tap_set_end_state(state); @@ -246,13 +234,14 @@ void usbprog_end_state(tap_state_t state) } } -void usbprog_state_move(void) +static void usbprog_state_move(void) { int i = 0, tms = 0; - u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state()); + uint8_t tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state()); + int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state()); usbprog_jtag_write_tms(usbprog_jtag_handle, (char)tms_scan); - for (i = 0; i < 7; i++) + for (i = 0; i < tms_count; i++) { tms = (tms_scan >> i) & 1; } @@ -260,11 +249,15 @@ void usbprog_state_move(void) tap_set_state(tap_get_end_state()); } -void usbprog_path_move(pathmove_command_t *cmd) +static void usbprog_path_move(pathmove_command_t *cmd) { int num_states = cmd->num_states; int state_count; + /* There may be queued transitions, and before following a specified + path, we must flush those queued transitions */ + usbprog_jtag_tms_send(usbprog_jtag_handle); + state_count = 0; while (num_states) { @@ -294,7 +287,7 @@ void usbprog_path_move(pathmove_command_t *cmd) tap_set_end_state(tap_get_state()); } -void usbprog_runtest(int num_cycles) +static void usbprog_runtest(int num_cycles) { int i; @@ -323,6 +316,10 @@ void usbprog_runtest(int num_cycles) usbprog_write(0, 0, 0); } +#ifdef _DEBUG_JTAG_IO_ + LOG_DEBUG("runtest: cur_state %s end_state %s", tap_state_name(tap_get_state()), tap_state_name(tap_get_end_state())); +#endif + /* finish in end_state */ /* usbprog_end_state(saved_end_state); @@ -331,7 +328,7 @@ void usbprog_runtest(int num_cycles) */ } -void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) +static void usbprog_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size) { tap_state_t saved_end_state = tap_get_end_state(); @@ -340,9 +337,10 @@ void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) else usbprog_end_state(TAP_DRSHIFT); - /* usbprog_jtag_tms_send(usbprog_jtag_handle); */ + /* Only move if we're not already there */ + if (tap_get_state() != tap_get_end_state()) + usbprog_state_move(); - usbprog_state_move(); usbprog_end_state(saved_end_state); usbprog_jtag_tms_send(usbprog_jtag_handle); @@ -358,6 +356,7 @@ void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) } f(usbprog_jtag_handle, (char *)buffer, scan_size); + /* The adapter does the transition to PAUSE internally */ if (ir_scan) tap_set_state(TAP_IRPAUSE); else @@ -369,7 +368,7 @@ void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) /*************** jtag wrapper functions *********************/ -void usbprog_write(int tck, int tms, int tdi) +static void usbprog_write(int tck, int tms, int tdi) { unsigned char output_value=0x00; @@ -384,7 +383,7 @@ void usbprog_write(int tck, int tms, int tdi) } /* (1) assert or (0) deassert reset lines */ -void usbprog_reset(int trst, int srst) +static void usbprog_reset(int trst, int srst) { LOG_DEBUG("trst: %i, srst: %i", trst, srst); @@ -439,13 +438,15 @@ struct usbprog_jtag* usbprog_jtag_open(void) return 0; } -void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag) +#if 0 +static void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag) { usb_close(usbprog_jtag->usb_handle); free(usbprog_jtag); } +#endif -unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen) +static unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen) { int res = usb_bulk_write(usbprog_jtag->usb_handle, 3, msg,msglen, 100); if ((msg[0] == 2) || (msg[0] == 1) || (msg[0] == 4) || (msg[0] == 0) || \ @@ -465,12 +466,12 @@ unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, return 0; } -void usbprog_jtag_init(struct usbprog_jtag *usbprog_jtag) +static void usbprog_jtag_init(struct usbprog_jtag *usbprog_jtag) { usbprog_jtag_set_direction(usbprog_jtag, 0xFE); } -void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char * buffer, int size) +static void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char * buffer, int size) { char tmp[64]; /* fastes packet size for usb controller */ int send_bits, bufindex = 0, fillindex = 0, i, loops; @@ -525,7 +526,7 @@ void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char * buffe } } -void usbprog_jtag_read_tdo(struct usbprog_jtag *usbprog_jtag, char * buffer, int size) +static void usbprog_jtag_read_tdo(struct usbprog_jtag *usbprog_jtag, char * buffer, int size) { char tmp[64]; /* fastes packet size for usb controller */ int send_bits, fillindex = 0, i, loops; @@ -572,7 +573,7 @@ void usbprog_jtag_read_tdo(struct usbprog_jtag *usbprog_jtag, char * buffer, int } } -void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char * buffer, int size) +static void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char * buffer, int size) { char tmp[64]; /* fastes packet size for usb controller */ int send_bits, bufindex = 0, i, loops; @@ -608,12 +609,12 @@ void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char * buffer, in } } -void usbprog_jtag_write_tms(struct usbprog_jtag *usbprog_jtag, char tms_scan) +static void usbprog_jtag_write_tms(struct usbprog_jtag *usbprog_jtag, char tms_scan) { usbprog_jtag_tms_collect(tms_scan); } -void usbprog_jtag_set_direction(struct usbprog_jtag *usbprog_jtag, unsigned char direction) +static void usbprog_jtag_set_direction(struct usbprog_jtag *usbprog_jtag, unsigned char direction) { char tmp[2]; tmp[0] = PORT_DIRECTION; @@ -621,7 +622,7 @@ void usbprog_jtag_set_direction(struct usbprog_jtag *usbprog_jtag, unsigned char usbprog_jtag_message(usbprog_jtag, tmp, 2); } -void usbprog_jtag_write_slice(struct usbprog_jtag *usbprog_jtag,unsigned char value) +static void usbprog_jtag_write_slice(struct usbprog_jtag *usbprog_jtag,unsigned char value) { char tmp[2]; tmp[0] = PORT_SET; @@ -629,15 +630,17 @@ void usbprog_jtag_write_slice(struct usbprog_jtag *usbprog_jtag,unsigned char va usbprog_jtag_message(usbprog_jtag, tmp, 2); } -unsigned char usbprog_jtag_get_port(struct usbprog_jtag *usbprog_jtag) +#if 0 +static unsigned char usbprog_jtag_get_port(struct usbprog_jtag *usbprog_jtag) { char tmp[2]; tmp[0] = PORT_GET; tmp[1] = 0x00; return usbprog_jtag_message(usbprog_jtag, tmp, 2); } +#endif -void usbprog_jtag_set_bit(struct usbprog_jtag *usbprog_jtag,int bit, int value) +static void usbprog_jtag_set_bit(struct usbprog_jtag *usbprog_jtag,int bit, int value) { char tmp[3]; tmp[0] = PORT_SETBIT; @@ -649,7 +652,8 @@ void usbprog_jtag_set_bit(struct usbprog_jtag *usbprog_jtag,int bit, int value) usbprog_jtag_message(usbprog_jtag, tmp, 3); } -int usbprog_jtag_get_bit(struct usbprog_jtag *usbprog_jtag, int bit) +#if 0 +static int usbprog_jtag_get_bit(struct usbprog_jtag *usbprog_jtag, int bit) { char tmp[2]; tmp[0] = PORT_GETBIT; @@ -660,14 +664,15 @@ int usbprog_jtag_get_bit(struct usbprog_jtag *usbprog_jtag, int bit) else return 0; } +#endif -void usbprog_jtag_tms_collect(char tms_scan) +static void usbprog_jtag_tms_collect(char tms_scan) { tms_chain[tms_chain_index] = tms_scan; tms_chain_index++; } -void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag) +static void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag) { int i; /* LOG_INFO("TMS SEND"); */