X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Famt_jtagaccel.c;h=c8fcc54f93032191b110a4d62af9166147156dc5;hp=f03b23f12c0d270d2adf3d8bbd18bd50231d4f66;hb=d6a686c8521d0dab4f5a0f44f8fb6d49a43bea8b;hpb=c45de8073d027f1a4d39640dc140666f27960e3b diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index f03b23f12c..c8fcc54f93 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -21,25 +21,14 @@ #include "config.h" #endif -#include "replacements.h" +#include "interface.h" +#include "commands.h" -#include "jtag.h" - -/* system includes */ - -#ifdef _WIN32 -#include "errno.h" -#endif /* _WIN32 */ - -#include -#include #if PARPORT_USE_PPDEV == 1 #include #include -#include #include -#include #else /* not PARPORT_USE_PPDEV */ #ifndef _WIN32 #include @@ -49,46 +38,48 @@ #if PARPORT_USE_GIVEIO == 1 #if IS_CYGWIN == 1 #include -#include #endif #endif -#include "log.h" - /* configuration */ -u16 amt_jtagaccel_port; +static uint16_t amt_jtagaccel_port; /* interface variables */ -static u8 aw_control_rst = 0x00; -static u8 aw_control_fsm = 0x10; -static u8 aw_control_baudrate = 0x20; +static uint8_t aw_control_rst = 0x00; +static uint8_t aw_control_fsm = 0x10; +static uint8_t aw_control_baudrate = 0x20; static int rtck_enabled = 0; #if PARPORT_USE_PPDEV == 1 static int device_handle; -int addr_mode = IEEE1284_MODE_EPP | IEEE1284_ADDR ; -int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA ; + +static int addr_mode = IEEE1284_MODE_EPP | IEEE1284_ADDR ; #define AMT_AW(val) do { ioctl(device_handle, PPSETMODE, &addr_mode); write(device_handle, &val, 1); } while (0) #define AMT_AR(val) do { ioctl(device_handle, PPSETMODE, &addr_mode); read(device_handle, &val, 1); } while (0) + +static int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA ; #define AMT_DW(val) do { ioctl(device_handle, PPSETMODE, &data_mode); write(device_handle, &val, 1); } while (0) #define AMT_DR(val) do { ioctl(device_handle, PPSETMODE, &data_mode); read(device_handle, &val, 1); } while (0) + #else + #define AMT_AW(val) do { outb(val, amt_jtagaccel_port + 3); } while (0) #define AMT_AR(val) do { val = inb(amt_jtagaccel_port + 3); } while (0) #define AMT_DW(val) do { outb(val, amt_jtagaccel_port + 4); } while (0) #define AMT_DR(val) do { val = inb(amt_jtagaccel_port + 4); } while (0) -#endif -int amt_jtagaccel_execute_queue(void); -int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx); -int amt_jtagaccel_speed(int speed); -int amt_jtagaccel_init(void); -int amt_jtagaccel_quit(void); +#endif // PARPORT_USE_PPDEV -int amt_jtagaccel_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int amt_jtagaccel_execute_queue(void); +static int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx); +static int amt_jtagaccel_speed(int speed); +static int amt_jtagaccel_init(void); +static int amt_jtagaccel_quit(void); + +static int amt_jtagaccel_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); /* tap_move[i][j]: tap movement command to go from state i to state j * 0: Test-Logic-Reset @@ -98,17 +89,18 @@ int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *c * 4: Shift-IR * 5: Pause-IR */ -u8 amt_jtagaccel_tap_move[6][6][2] = +static uint8_t amt_jtagaccel_tap_move[6][6][2] = { - /* TLR RTI SD PD SI PI */ - {{0x1f, 0x00}, {0x0f, 0x00}, {0x8a, 0x04}, {0x0a, 0x00}, {0x06, 0x00}, {0x96, 0x00}}, /* TLR */ - {{0x1f, 0x00}, {0x00, 0x00}, {0x85, 0x08}, {0x05, 0x00}, {0x8b, 0x08}, {0x0b, 0x00}}, /* RTI */ - {{0x1f, 0x00}, {0x0d, 0x00}, {0x00, 0x00}, {0x01, 0x00}, {0x8f, 0x09}, {0x8f, 0x01}}, /* SD */ - {{0x1f, 0x00}, {0x0c, 0x00}, {0x08, 0x00}, {0x00, 0x00}, {0x8f, 0x09}, {0x8f, 0x01}}, /* PD */ - {{0x1f, 0x00}, {0x0d, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x00, 0x00}, {0x01, 0x00}}, /* SI */ - {{0x1f, 0x00}, {0x0c, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x08, 0x00}, {0x00, 0x00}}, /* PI */ + /* RESET IDLE DRSHIFT DRPAUSE IRSHIFT IRPAUSE */ + {{0x1f, 0x00}, {0x0f, 0x00}, {0x05, 0x00}, {0x0a, 0x00}, {0x06, 0x00}, {0x96, 0x00}}, /* RESET */ + {{0x1f, 0x00}, {0x00, 0x00}, {0x04, 0x00}, {0x05, 0x00}, {0x06, 0x00}, {0x0b, 0x00}}, /* IDLE */ + {{0x1f, 0x00}, {0x0d, 0x00}, {0x00, 0x00}, {0x01, 0x00}, {0x8f, 0x09}, {0x8f, 0x01}}, /* DRSHIFT */ + {{0x1f, 0x00}, {0x0c, 0x00}, {0x08, 0x00}, {0x00, 0x00}, {0x8f, 0x09}, {0x8f, 0x01}}, /* DRPAUSE */ + {{0x1f, 0x00}, {0x0d, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x00, 0x00}, {0x01, 0x00}}, /* IRSHIFT */ + {{0x1f, 0x00}, {0x0c, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x08, 0x00}, {0x00, 0x00}}, /* IRPAUSE */ }; + jtag_interface_t amt_jtagaccel_interface = { .name = "amt_jtagaccel", @@ -121,7 +113,7 @@ jtag_interface_t amt_jtagaccel_interface = .quit = amt_jtagaccel_quit, }; -int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx) +static int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx) { register_command(cmd_ctx, NULL, "parport_port", amt_jtagaccel_handle_parport_port_command, COMMAND_CONFIG, NULL); @@ -131,7 +123,7 @@ int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -void amt_jtagaccel_reset(int trst, int srst) +static void amt_jtagaccel_reset(int trst, int srst) { if (trst == 1) aw_control_rst |= 0x4; @@ -146,7 +138,7 @@ void amt_jtagaccel_reset(int trst, int srst) AMT_AW(aw_control_rst); } -int amt_jtagaccel_speed(int speed) +static int amt_jtagaccel_speed(int speed) { aw_control_baudrate &= 0xf0; aw_control_baudrate |= speed & 0x0f; @@ -155,10 +147,10 @@ int amt_jtagaccel_speed(int speed) return ERROR_OK; } -void amt_jtagaccel_end_state(int state) +static void amt_jtagaccel_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); @@ -166,10 +158,10 @@ void amt_jtagaccel_end_state(int state) } } -void amt_wait_scan_busy(void) +static void amt_wait_scan_busy(void) { int timeout = 4096; - u8 ar_status; + uint8_t ar_status; AMT_AR(ar_status); while (((ar_status) & 0x80) && (timeout-- > 0)) @@ -182,16 +174,20 @@ void amt_wait_scan_busy(void) } } -void amt_jtagaccel_state_move(void) +static void amt_jtagaccel_state_move(void) { - u8 aw_scan_tms_5; - u8 tms_scan[2]; + uint8_t aw_scan_tms_5; + uint8_t tms_scan[2]; - tms_scan[0] = amt_jtagaccel_tap_move[tap_move_map[cur_state]][tap_move_map[end_state]][0]; - tms_scan[1] = amt_jtagaccel_tap_move[tap_move_map[cur_state]][tap_move_map[end_state]][1]; + tap_state_t cur_state = tap_get_state(); + tap_state_t end_state = tap_get_end_state(); + + tms_scan[0] = amt_jtagaccel_tap_move[tap_move_ndx(cur_state)][tap_move_ndx(end_state)][0]; + tms_scan[1] = amt_jtagaccel_tap_move[tap_move_ndx(cur_state)][tap_move_ndx(end_state)][1]; aw_scan_tms_5 = 0x40 | (tms_scan[0] & 0x1f); AMT_AW(aw_scan_tms_5); + int jtag_speed = jtag_get_speed(); if (jtag_speed > 3 || rtck_enabled) amt_wait_scan_busy(); @@ -203,19 +199,19 @@ void amt_jtagaccel_state_move(void) amt_wait_scan_busy(); } - cur_state = end_state; + tap_set_state(end_state); } -void amt_jtagaccel_runtest(int num_cycles) +static void amt_jtagaccel_runtest(int num_cycles) { int i = 0; - u8 aw_scan_tms_5; - u8 aw_scan_tms_1to4; + uint8_t aw_scan_tms_5; + uint8_t aw_scan_tms_1to4; - enum tap_state saved_end_state = end_state; + tap_state_t saved_end_state = tap_get_end_state(); - /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_IDLE) + /* only do a state_move when we're not already in IDLE */ + if (tap_get_state() != TAP_IDLE) { amt_jtagaccel_end_state(TAP_IDLE); amt_jtagaccel_state_move(); @@ -235,20 +231,21 @@ void amt_jtagaccel_runtest(int num_cycles) } amt_jtagaccel_end_state(saved_end_state); - if (cur_state != end_state) + if (tap_get_state() != tap_get_end_state()) amt_jtagaccel_state_move(); } -void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) +static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size) { int bits_left = scan_size; int bit_count = 0; - enum tap_state saved_end_state = end_state; - u8 aw_tdi_option; - u8 dw_tdi_scan; - u8 dr_tdo; - u8 aw_tms_scan; - u8 tms_scan[2]; + tap_state_t saved_end_state = tap_get_end_state(); + uint8_t aw_tdi_option; + uint8_t dw_tdi_scan; + uint8_t dr_tdo; + uint8_t aw_tms_scan; + uint8_t tms_scan[2]; + int jtag_speed = jtag_get_speed(); if (ir_scan) amt_jtagaccel_end_state(TAP_IRSHIFT); @@ -297,8 +294,8 @@ void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_s bits_left -= 8; } - tms_scan[0] = amt_jtagaccel_tap_move[tap_move_map[cur_state]][tap_move_map[end_state]][0]; - tms_scan[1] = amt_jtagaccel_tap_move[tap_move_map[cur_state]][tap_move_map[end_state]][1]; + tms_scan[0] = amt_jtagaccel_tap_move[tap_move_ndx(tap_get_state())][tap_move_ndx(tap_get_end_state())][0]; + tms_scan[1] = amt_jtagaccel_tap_move[tap_move_ndx(tap_get_state())][tap_move_ndx(tap_get_end_state())][1]; aw_tms_scan = 0x40 | (tms_scan[0] & 0x1f) | (buf_get_u32(buffer, bit_count, 1) << 5); AMT_AW(aw_tms_scan); if (jtag_speed > 3 || rtck_enabled) @@ -318,15 +315,15 @@ void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_s if (jtag_speed > 3 || rtck_enabled) amt_wait_scan_busy(); } - cur_state = end_state; + tap_set_state(tap_get_end_state()); } -int amt_jtagaccel_execute_queue(void) +static int amt_jtagaccel_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; int retval; /* return ERROR_OK, unless a jtag_read_buffer returns a failed check @@ -338,20 +335,13 @@ int amt_jtagaccel_execute_queue(void) { 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 != -1) - amt_jtagaccel_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); #endif if (cmd->cmd.reset->trst == 1) { - cur_state = TAP_RESET; + tap_set_state(TAP_RESET); } amt_jtagaccel_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; @@ -359,24 +349,21 @@ int amt_jtagaccel_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) - amt_jtagaccel_end_state(cmd->cmd.runtest->end_state); + amt_jtagaccel_end_state(cmd->cmd.runtest->end_state); amt_jtagaccel_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 != -1) - amt_jtagaccel_end_state(cmd->cmd.statemove->end_state); + amt_jtagaccel_end_state(cmd->cmd.statemove->end_state); amt_jtagaccel_state_move(); break; case JTAG_SCAN: #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("scan end in %i", cmd->cmd.scan->end_state); #endif - if (cmd->cmd.scan->end_state != -1) - amt_jtagaccel_end_state(cmd->cmd.scan->end_state); + amt_jtagaccel_end_state(cmd->cmd.scan->end_state); scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer); type = jtag_scan_type(cmd->cmd.scan); amt_jtagaccel_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size); @@ -404,39 +391,39 @@ int amt_jtagaccel_execute_queue(void) #if PARPORT_USE_GIVEIO == 1 int amt_jtagaccel_get_giveio_access(void) { - HANDLE h; - OSVERSIONINFO version; + HANDLE h; + OSVERSIONINFO version; - version.dwOSVersionInfoSize = sizeof version; - if (!GetVersionEx( &version )) { + version.dwOSVersionInfoSize = sizeof version; + if (!GetVersionEx(&version)) { errno = EINVAL; return -1; - } - if (version.dwPlatformId != VER_PLATFORM_WIN32_NT) + } + if (version.dwPlatformId != VER_PLATFORM_WIN32_NT) return 0; - h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - if (h == INVALID_HANDLE_VALUE) { + h = CreateFile("\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (h == INVALID_HANDLE_VALUE) { errno = ENODEV; return -1; - } + } - CloseHandle( h ); + CloseHandle(h); - return 0; + return 0; } #endif -int amt_jtagaccel_init(void) +static int amt_jtagaccel_init(void) { #if PARPORT_USE_PPDEV == 1 char buffer[256]; int i = 0; - u8 control_port; + uint8_t control_port; #else - u8 status_port; + uint8_t status_port; #endif - u8 ar_status; + uint8_t ar_status; #if PARPORT_USE_PPDEV == 1 if (device_handle > 0) @@ -511,8 +498,9 @@ int amt_jtagaccel_init(void) aw_control_fsm |= 0x04; AMT_AW(aw_control_fsm); - amt_jtagaccel_speed(jtag_speed); + amt_jtagaccel_speed(jtag_get_speed()); + enum reset_types jtag_reset_config = jtag_get_reset_config(); if (jtag_reset_config & RESET_TRST_OPEN_DRAIN) aw_control_rst &= ~0x8; else @@ -532,25 +520,37 @@ int amt_jtagaccel_init(void) return ERROR_OK; } -int amt_jtagaccel_quit(void) +static int amt_jtagaccel_quit(void) { return ERROR_OK; } -int amt_jtagaccel_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int amt_jtagaccel_handle_parport_port_command( + struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - if (argc == 0) - return ERROR_OK; + if (argc == 1) + { + /* only if the port wasn't overwritten by cmdline */ + if (amt_jtagaccel_port == 0) + { + int retval = parse_u16(args[0], &amt_jtagaccel_port); + if (ERROR_OK != retval) + return retval; + } + else + { + LOG_ERROR("The parport port was already configured!"); + return ERROR_FAIL; + } + } - /* only if the port wasn't overwritten by cmdline */ - if (amt_jtagaccel_port == 0) - amt_jtagaccel_port = strtoul(args[0], NULL, 0); + command_print(cmd_ctx, "parport port = %u", amt_jtagaccel_port); return ERROR_OK; } -int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { if (argc == 0) {