X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Famt_jtagaccel.c;h=d26482a6136703d55b718bbe1f1342ce336882b2;hp=b19fae17ebd6a7980634cfc57c5788c69565482c;hb=a93b404161dc42f8dee805c8f95bc4974aded9cb;hpb=a3e84343e202eb70ebce0ec1e8b15d7f9ce57f00 diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index b19fae17eb..d26482a613 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -42,13 +42,13 @@ #endif /* configuration */ -static 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; @@ -72,15 +72,6 @@ static int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA ; #endif // PARPORT_USE_PPDEV -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 * 1: Run-Test/Idle @@ -89,11 +80,11 @@ static int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, * 4: Shift-IR * 5: Pause-IR */ -static u8 amt_jtagaccel_tap_move[6][6][2] = +static uint8_t amt_jtagaccel_tap_move[6][6][2] = { /* RESET IDLE DRSHIFT DRPAUSE IRSHIFT IRPAUSE */ - {{0x1f, 0x00}, {0x0f, 0x00}, {0x8a, 0x04}, {0x0a, 0x00}, {0x06, 0x00}, {0x96, 0x00}}, /* RESET */ - {{0x1f, 0x00}, {0x00, 0x00}, {0x85, 0x08}, {0x05, 0x00}, {0x8b, 0x08}, {0x0b, 0x00}}, /* IDLE */ + {{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 */ @@ -101,28 +92,6 @@ static u8 amt_jtagaccel_tap_move[6][6][2] = }; -jtag_interface_t amt_jtagaccel_interface = -{ - .name = "amt_jtagaccel", - - .execute_queue = amt_jtagaccel_execute_queue, - - .speed = amt_jtagaccel_speed, - .register_commands = amt_jtagaccel_register_commands, - .init = amt_jtagaccel_init, - .quit = amt_jtagaccel_quit, -}; - -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); - register_command(cmd_ctx, NULL, "rtck", amt_jtagaccel_handle_rtck_command, - COMMAND_CONFIG, NULL); - - return ERROR_OK; -} - static void amt_jtagaccel_reset(int trst, int srst) { if (trst == 1) @@ -161,7 +130,7 @@ static void amt_jtagaccel_end_state(tap_state_t state) 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)) @@ -176,8 +145,8 @@ static void amt_wait_scan_busy(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]; tap_state_t cur_state = tap_get_state(); tap_state_t end_state = tap_get_end_state(); @@ -187,6 +156,7 @@ static void amt_jtagaccel_state_move(void) 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(); @@ -204,8 +174,8 @@ static void amt_jtagaccel_state_move(void) 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; tap_state_t saved_end_state = tap_get_end_state(); @@ -234,16 +204,17 @@ static void amt_jtagaccel_runtest(int num_cycles) amt_jtagaccel_state_move(); } -static void amt_jtagaccel_scan(bool 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; tap_state_t saved_end_state = tap_get_end_state(); - u8 aw_tdi_option; - u8 dw_tdi_scan; - u8 dr_tdo; - u8 aw_tms_scan; - u8 tms_scan[2]; + 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); @@ -318,10 +289,10 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, u8 *buffer, in static int amt_jtagaccel_execute_queue(void) { - jtag_command_t *cmd = jtag_command_queue; /* currently processed command */ + struct jtag_command *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 @@ -372,7 +343,7 @@ static int amt_jtagaccel_execute_queue(void) break; case JTAG_SLEEP: #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("sleep %i", cmd->cmd.sleep->us); + LOG_DEBUG("sleep %" PRIi32, cmd->cmd.sleep->us); #endif jtag_sleep(cmd->cmd.sleep->us); break; @@ -393,20 +364,20 @@ int amt_jtagaccel_get_giveio_access(void) OSVERSIONINFO version; version.dwOSVersionInfoSize = sizeof version; - if (!GetVersionEx( &version )) { + if (!GetVersionEx(&version)) { errno = EINVAL; return -1; } if (version.dwPlatformId != VER_PLATFORM_WIN32_NT) return 0; - h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + 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; } @@ -417,11 +388,11 @@ 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) @@ -496,8 +467,9 @@ static 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 @@ -523,28 +495,39 @@ static int amt_jtagaccel_quit(void) return ERROR_OK; } -static int amt_jtagaccel_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(amt_jtagaccel_handle_parport_port_command) { - if (argc == 0) - return ERROR_OK; + if (CMD_ARGC == 1) + { + /* only if the port wasn't overwritten by cmdline */ + if (amt_jtagaccel_port == 0) + { + uint16_t port; + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], port); + amt_jtagaccel_port = port; + } + 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; } -static int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(amt_jtagaccel_handle_rtck_command) { - if (argc == 0) + if (CMD_ARGC == 0) { - command_print(cmd_ctx, "amt_jtagaccel RTCK feature %s", (rtck_enabled) ? "enabled" : "disabled"); + command_print(CMD_CTX, "amt_jtagaccel RTCK feature %s", (rtck_enabled) ? "enabled" : "disabled"); return ERROR_OK; } else { - if (strcmp(args[0], "enabled") == 0) + if (strcmp(CMD_ARGV[0], "enabled") == 0) { rtck_enabled = 1; } @@ -556,3 +539,30 @@ static int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, return ERROR_OK; } + +static const struct command_registration amtjtagaccel_command_handlers[] = { + { + .name = "parport_port", + .handler = &amt_jtagaccel_handle_parport_port_command, + .mode = COMMAND_CONFIG, + .help = "configure the parallel port to use", + .usage = "", + }, + { + .name = "parport_port", + .handler = &amt_jtagaccel_handle_rtck_command, + .mode = COMMAND_CONFIG, + .help = "enable RTCK", + .usage = "", + }, + COMMAND_REGISTRATION_DONE +}; + +struct jtag_interface amt_jtagaccel_interface = { + .name = "amt_jtagaccel", + .commands = amtjtagaccel_command_handlers, + .init = &amt_jtagaccel_init, + .quit = &amt_jtagaccel_quit, + .speed = &amt_jtagaccel_speed, + .execute_queue = &amt_jtagaccel_execute_queue, + };