From c45de8073d027f1a4d39640dc140666f27960e3b Mon Sep 17 00:00:00 2001 From: kc8apf Date: Sat, 13 Dec 2008 06:25:50 +0000 Subject: Change tap_state naming to be consistent with SVF documentation. Courtesy of Dick Hollenbeck git-svn-id: svn://svn.berlios.de/openocd/trunk@1232 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/amt_jtagaccel.c | 106 ++++++------- src/jtag/bitbang.c | 78 ++++----- src/jtag/bitq.c | 12 +- src/jtag/ft2232.c | 406 +++++++++++++++++++++++------------------------ src/jtag/gw16012.c | 98 ++++++------ src/jtag/jlink.c | 222 +++++++++++++------------- src/jtag/jtag.c | 74 ++++----- src/jtag/jtag.h | 33 ++-- src/jtag/usbprog.c | 14 +- src/jtag/zy1000.c | 38 ++--- 10 files changed, 538 insertions(+), 543 deletions(-) (limited to 'src/jtag') diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index b9f9d38f..f03b23f1 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -109,13 +109,13 @@ u8 amt_jtagaccel_tap_move[6][6][2] = {{0x1f, 0x00}, {0x0c, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x08, 0x00}, {0x00, 0x00}}, /* PI */ }; -jtag_interface_t amt_jtagaccel_interface = +jtag_interface_t amt_jtagaccel_interface = { .name = "amt_jtagaccel", - + .execute_queue = amt_jtagaccel_execute_queue, - .speed = amt_jtagaccel_speed, + .speed = amt_jtagaccel_speed, .register_commands = amt_jtagaccel_register_commands, .init = amt_jtagaccel_init, .quit = amt_jtagaccel_quit, @@ -127,7 +127,7 @@ int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx) COMMAND_CONFIG, NULL); register_command(cmd_ctx, NULL, "rtck", amt_jtagaccel_handle_rtck_command, COMMAND_CONFIG, NULL); - + return ERROR_OK; } @@ -142,7 +142,7 @@ void amt_jtagaccel_reset(int trst, int srst) aw_control_rst |= 0x1; else if (srst == 0) aw_control_rst &= ~0x1; - + AMT_AW(aw_control_rst); } @@ -151,7 +151,7 @@ int amt_jtagaccel_speed(int speed) aw_control_baudrate &= 0xf0; aw_control_baudrate |= speed & 0x0f; AMT_AW(aw_control_baudrate); - + return ERROR_OK; } @@ -170,11 +170,11 @@ void amt_wait_scan_busy(void) { int timeout = 4096; u8 ar_status; - + AMT_AR(ar_status); while (((ar_status) & 0x80) && (timeout-- > 0)) AMT_AR(ar_status); - + if (ar_status & 0x80) { LOG_ERROR("amt_jtagaccel timed out while waiting for end of scan, rtck was %s, last AR_STATUS: 0x%2.2x", (rtck_enabled) ? "enabled" : "disabled", ar_status); @@ -186,15 +186,15 @@ void amt_jtagaccel_state_move(void) { u8 aw_scan_tms_5; u8 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]; - + aw_scan_tms_5 = 0x40 | (tms_scan[0] & 0x1f); AMT_AW(aw_scan_tms_5); if (jtag_speed > 3 || rtck_enabled) amt_wait_scan_busy(); - + if (tms_scan[0] & 0x80) { aw_scan_tms_5 = 0x40 | (tms_scan[1] & 0x1f); @@ -202,7 +202,7 @@ void amt_jtagaccel_state_move(void) if (jtag_speed > 3 || rtck_enabled) amt_wait_scan_busy(); } - + cur_state = end_state; } @@ -213,27 +213,27 @@ void amt_jtagaccel_runtest(int num_cycles) u8 aw_scan_tms_1to4; enum tap_state saved_end_state = end_state; - + /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_RTI) + if (cur_state != TAP_IDLE) { - amt_jtagaccel_end_state(TAP_RTI); + amt_jtagaccel_end_state(TAP_IDLE); amt_jtagaccel_state_move(); } - + while (num_cycles - i >= 5) { aw_scan_tms_5 = 0x40; AMT_AW(aw_scan_tms_5); i += 5; } - + if (num_cycles - i > 0) { aw_scan_tms_1to4 = 0x80 | ((num_cycles - i - 1) & 0x3) << 4; AMT_AW(aw_scan_tms_1to4); } - + amt_jtagaccel_end_state(saved_end_state); if (cur_state != end_state) amt_jtagaccel_state_move(); @@ -251,9 +251,9 @@ void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_s u8 tms_scan[2]; if (ir_scan) - amt_jtagaccel_end_state(TAP_SI); + amt_jtagaccel_end_state(TAP_IRSHIFT); else - amt_jtagaccel_end_state(TAP_SD); + amt_jtagaccel_end_state(TAP_DRSHIFT); amt_jtagaccel_state_move(); amt_jtagaccel_end_state(saved_end_state); @@ -263,7 +263,7 @@ void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_s { aw_tdi_option = 0x30 | (((scan_size - 1) % 8) - 1); AMT_AW(aw_tdi_option); - + dw_tdi_scan = buf_get_u32(buffer, bit_count, (scan_size - 1) % 8) & 0xff; AMT_DW(dw_tdi_scan); if (jtag_speed > 3 || rtck_enabled) @@ -275,11 +275,11 @@ void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_s dr_tdo = dr_tdo >> (8 - ((scan_size - 1) % 8)); buf_set_u32(buffer, bit_count, (scan_size - 1) % 8, dr_tdo); } - + bit_count += (scan_size - 1) % 8; bits_left -= (scan_size - 1) % 8; } - + while (bits_left - 1 >= 8) { dw_tdi_scan = buf_get_u32(buffer, bit_count, 8) & 0xff; @@ -292,11 +292,11 @@ void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_s AMT_DR(dr_tdo); buf_set_u32(buffer, bit_count, 8, dr_tdo); } - + bit_count += 8; 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]; aw_tms_scan = 0x40 | (tms_scan[0] & 0x1f) | (buf_get_u32(buffer, bit_count, 1) << 5); @@ -310,7 +310,7 @@ void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_s dr_tdo = dr_tdo >> 7; buf_set_u32(buffer, bit_count, 1, dr_tdo); } - + if (tms_scan[0] & 0x80) { aw_tms_scan = 0x40 | (tms_scan[1] & 0x1f); @@ -328,12 +328,12 @@ int amt_jtagaccel_execute_queue(void) enum scan_type type; u8 *buffer; int retval; - + /* return ERROR_OK, unless a jtag_read_buffer returns a failed check * that wasn't handled by a caller-provided error handler - */ + */ retval = ERROR_OK; - + while (cmd) { switch (cmd->type) @@ -351,7 +351,7 @@ int amt_jtagaccel_execute_queue(void) #endif if (cmd->cmd.reset->trst == 1) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; } amt_jtagaccel_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; @@ -397,7 +397,7 @@ int amt_jtagaccel_execute_queue(void) } cmd = cmd->next; } - + return retval; } @@ -409,16 +409,16 @@ int amt_jtagaccel_get_giveio_access(void) version.dwOSVersionInfoSize = sizeof version; if (!GetVersionEx( &version )) { - errno = EINVAL; - return -1; + errno = EINVAL; + return -1; } if (version.dwPlatformId != VER_PLATFORM_WIN32_NT) - return 0; + return 0; h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); if (h == INVALID_HANDLE_VALUE) { - errno = ENODEV; - return -1; + errno = ENODEV; + return -1; } CloseHandle( h ); @@ -437,7 +437,7 @@ int amt_jtagaccel_init(void) u8 status_port; #endif u8 ar_status; - + #if PARPORT_USE_PPDEV == 1 if (device_handle > 0) { @@ -447,7 +447,7 @@ int amt_jtagaccel_init(void) snprintf(buffer, 256, "/dev/parport%d", amt_jtagaccel_port); device_handle = open(buffer, O_RDWR); - + if (device_handle < 0) { LOG_ERROR("cannot open device. check it exists and that user read and write rights are set"); @@ -468,7 +468,7 @@ int amt_jtagaccel_init(void) LOG_ERROR(" cannot set compatible mode to device"); return ERROR_JTAG_INIT_FAILED; } - + control_port = 0x00; i = ioctl(device_handle, PPWCONTROL, &control_port); @@ -484,57 +484,57 @@ int amt_jtagaccel_init(void) #if PARPORT_USE_GIVEIO == 1 if (amt_jtagaccel_get_giveio_access() != 0) { -#else /* PARPORT_USE_GIVEIO */ +#else /* PARPORT_USE_GIVEIO */ if (ioperm(amt_jtagaccel_port, 5, 1) != 0) { #endif /* PARPORT_USE_GIVEIO */ LOG_ERROR("missing privileges for direct i/o"); return ERROR_JTAG_INIT_FAILED; } - + /* prepare epp port */ /* clear timeout */ status_port = inb(amt_jtagaccel_port + 1); outb(status_port | 0x1, amt_jtagaccel_port + 1); - + /* reset epp port */ outb(0x00, amt_jtagaccel_port + 2); outb(0x04, amt_jtagaccel_port + 2); #endif - + if (rtck_enabled) - { + { /* set RTCK enable bit */ aw_control_fsm |= 0x02; } - + /* enable JTAG port */ aw_control_fsm |= 0x04; AMT_AW(aw_control_fsm); - + amt_jtagaccel_speed(jtag_speed); - + if (jtag_reset_config & RESET_TRST_OPEN_DRAIN) aw_control_rst &= ~0x8; else aw_control_rst |= 0x8; - + if (jtag_reset_config & RESET_SRST_PUSH_PULL) aw_control_rst &= ~0x2; else aw_control_rst |= 0x2; - + amt_jtagaccel_reset(0, 0); - + /* read status register */ AMT_AR(ar_status); LOG_DEBUG("AR_STATUS: 0x%2.2x", ar_status); - + return ERROR_OK; } int amt_jtagaccel_quit(void) { - + return ERROR_OK; } @@ -568,6 +568,6 @@ int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *c rtck_enabled = 0; } } - + return ERROR_OK; } diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c index 0f462a83..cc05dbee 100644 --- a/src/jtag/bitbang.c +++ b/src/jtag/bitbang.c @@ -41,24 +41,24 @@ bitbang_interface_t *bitbang_interface; /* DANGER!!!! clock absolutely *MUST* be 0 in idle or reset won't work! - * + * * Set this to 1 and str912 reset halt will fail. - * + * * If someone can submit a patch with an explanation it will be greatly * appreciated, but as far as I can tell (ØH) DCLK is generated upon - * clk=0 in TAP_RTI. Good luck deducing that from the ARM documentation! - * The ARM documentation uses the term "DCLK is asserted while in the TAP_RTI + * clk=0 in TAP_IDLE. Good luck deducing that from the ARM documentation! + * The ARM documentation uses the term "DCLK is asserted while in the TAP_IDLE * state". With hardware there is no such thing as *while* in a state. There * are only edges. So clk => 0 is in fact a very subtle state transition that - * happens *while* in the TAP_RTI state. "#&¤"#¤&"#&"#& - * + * happens *while* in the TAP_IDLE state. "#&¤"#¤&"#&"#& + * * For "reset halt" the last thing that happens before srst is asserted * is that the breakpoint is set up. If DCLK is not wiggled one last * time before the reset, then the breakpoint is not set up and * "reset halt" will fail to halt. - * + * */ -#define CLOCK_IDLE() 0 +#define CLOCK_IDLE() 0 int bitbang_execute_queue(void); @@ -76,10 +76,10 @@ void bitbang_end_state(enum tap_state state) } void bitbang_state_move(void) { - + int i=0, tms=0; u8 tms_scan = TAP_MOVE(cur_state, end_state); - + for (i = 0; i < 7; i++) { tms = (tms_scan >> i) & 1; @@ -87,7 +87,7 @@ void bitbang_state_move(void) { bitbang_interface->write(1, tms, 0); } bitbang_interface->write(CLOCK_IDLE(), tms, 0); - + cur_state = end_state; } @@ -113,7 +113,7 @@ void bitbang_path_move(pathmove_command_t *cmd) LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[state_count]]); exit(-1); } - + bitbang_interface->write(0, tms, 0); bitbang_interface->write(1, tms, 0); @@ -121,7 +121,7 @@ void bitbang_path_move(pathmove_command_t *cmd) state_count++; num_states--; } - + bitbang_interface->write(CLOCK_IDLE(), tms, 0); end_state = cur_state; @@ -130,16 +130,16 @@ void bitbang_path_move(pathmove_command_t *cmd) void bitbang_runtest(int num_cycles) { int i; - + enum tap_state saved_end_state = end_state; - + /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_RTI) + if (cur_state != TAP_IDLE) { - bitbang_end_state(TAP_RTI); + bitbang_end_state(TAP_IDLE); bitbang_state_move(); } - + /* execute num_cycles */ for (i = 0; i < num_cycles; i++) { @@ -147,7 +147,7 @@ void bitbang_runtest(int num_cycles) bitbang_interface->write(1, 0, 0); } bitbang_interface->write(CLOCK_IDLE(), 0, 0); - + /* finish in end_state */ bitbang_end_state(saved_end_state); if (cur_state != end_state) @@ -158,13 +158,13 @@ void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) { enum tap_state saved_end_state = end_state; int bit_cnt; - - if (!((!ir_scan && (cur_state == TAP_SD)) || (ir_scan && (cur_state == TAP_SI)))) + + if (!((!ir_scan && (cur_state == TAP_DRSHIFT)) || (ir_scan && (cur_state == TAP_IRSHIFT)))) { if (ir_scan) - bitbang_end_state(TAP_SI); + bitbang_end_state(TAP_IRSHIFT); else - bitbang_end_state(TAP_SD); + bitbang_end_state(TAP_DRSHIFT); bitbang_state_move(); bitbang_end_state(saved_end_state); @@ -181,7 +181,7 @@ void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) /* if we're just reading the scan, but don't care about the output * default to outputting 'low', this also makes valgrind traces more readable, * as it removes the dependency on an uninitialised value - */ + */ tdi=0; if ((type != SCAN_IN) && (buffer[bytec] & bcval)) tdi=1; @@ -192,7 +192,7 @@ void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) val=bitbang_interface->read(); bitbang_interface->write(1, tms, tdi); - + if (type != SCAN_OUT) { if (val) @@ -201,21 +201,21 @@ void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) buffer[bytec] &= ~bcval; } } - - /* TAP_SD & TAP_SI are illegal end states, so we always transition to the pause + + /* TAP_DRSHIFT & TAP_IRSHIFT are illegal end states, so we always transition to the pause * state which is a legal stable state from which statemove will work. - * - * Exit1 -> Pause + * + * Exit1 -> Pause */ bitbang_interface->write(0, 0, 0); bitbang_interface->write(1, 0, 0); bitbang_interface->write(CLOCK_IDLE(), 0, 0); - + if (ir_scan) - cur_state = TAP_PI; + cur_state = TAP_IRPAUSE; else - cur_state = TAP_PD; - + cur_state = TAP_DRPAUSE; + if (cur_state != end_state) bitbang_state_move(); } @@ -227,18 +227,18 @@ int bitbang_execute_queue(void) enum scan_type type; u8 *buffer; int retval; - + if (!bitbang_interface) { LOG_ERROR("BUG: Bitbang interface called, but not yet initialized"); exit(-1); } - + /* return ERROR_OK, unless a jtag_read_buffer returns a failed check * that wasn't handled by a caller-provided error handler - */ + */ retval = ERROR_OK; - + if(bitbang_interface->blink) bitbang_interface->blink(1); @@ -259,7 +259,7 @@ int bitbang_execute_queue(void) #endif if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST))) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; } bitbang_interface->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; @@ -313,7 +313,7 @@ int bitbang_execute_queue(void) } if(bitbang_interface->blink) bitbang_interface->blink(0); - + return retval; } diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c index 6bbfab58..47fdc923 100644 --- a/src/jtag/bitq.c +++ b/src/jtag/bitq.c @@ -195,7 +195,7 @@ void bitq_runtest(int num_cycles) int i; /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_RTI) bitq_state_move(TAP_RTI); + if (cur_state != TAP_IDLE) bitq_state_move(TAP_IDLE); /* execute num_cycles */ for (i = 0; i < num_cycles; i++) @@ -240,8 +240,8 @@ void bitq_scan_field(scan_field_t *field, int pause) if (pause) { bitq_io(0,0,0); - if (cur_state==TAP_SI) cur_state=TAP_PI; - else if (cur_state==TAP_SD) cur_state=TAP_PD; + if (cur_state==TAP_IRSHIFT) cur_state=TAP_IRPAUSE; + else if (cur_state==TAP_DRSHIFT) cur_state=TAP_DRPAUSE; } } @@ -250,8 +250,8 @@ void bitq_scan(scan_command_t *cmd) { int i; - if (cmd->ir_scan) bitq_state_move(TAP_SI); - else bitq_state_move(TAP_SD); + if (cmd->ir_scan) bitq_state_move(TAP_IRSHIFT); + else bitq_state_move(TAP_DRSHIFT); for (i=0; i < cmd->num_fields-1; i++) bitq_scan_field(&cmd->fields[i], 0); @@ -285,7 +285,7 @@ int bitq_execute_queue(void) #endif if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST))) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; } bitq_interface->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); if (bitq_interface->in_rdy()) bitq_in_proc(); diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c index b0c1c35c..5d79dfb6 100644 --- a/src/jtag/ft2232.c +++ b/src/jtag/ft2232.c @@ -157,13 +157,13 @@ static int ft2232_expect_read = 0; #define BUFFER_ADD ft2232_buffer[ft2232_buffer_size++] #define BUFFER_READ ft2232_buffer[ft2232_read_pointer++] -jtag_interface_t ft2232_interface = +jtag_interface_t ft2232_interface = { .name = "ft2232", .execute_queue = ft2232_execute_queue, .speed = ft2232_speed, .speed_div = ft2232_speed_div, - .khz = ft2232_khz, + .khz = ft2232_khz, .register_commands = ft2232_register_commands, .init = ft2232_init, .quit = ft2232_quit, @@ -183,7 +183,7 @@ int ft2232_write(u8 *buf, int size, u32* bytes_written) else { *bytes_written = dw_bytes_written; - return ERROR_OK; + return ERROR_OK; } #elif BUILD_FT2232_LIBFTDI == 1 int retval; @@ -196,7 +196,7 @@ int ft2232_write(u8 *buf, int size, u32* bytes_written) else { *bytes_written = retval; - return ERROR_OK; + return ERROR_OK; } #endif } @@ -211,20 +211,20 @@ int ft2232_read(u8* buf, int size, u32* bytes_read) while ((*bytes_read < size) && timeout--) { - if ((status = FT_Read(ftdih, buf + *bytes_read, size - - *bytes_read, &dw_bytes_read)) != FT_OK) + if ((status = FT_Read(ftdih, buf + *bytes_read, size - + *bytes_read, &dw_bytes_read)) != FT_OK) { - *bytes_read = 0; + *bytes_read = 0; LOG_ERROR("FT_Read returned: %lu", status); return ERROR_JTAG_DEVICE_ERROR; } - *bytes_read += dw_bytes_read; + *bytes_read += dw_bytes_read; } #elif BUILD_FT2232_LIBFTDI == 1 int retval; int timeout = 100; *bytes_read = 0; - + while ((*bytes_read < size) && timeout--) { if ((retval = ftdi_read_data(&ftdic, buf + *bytes_read, size - *bytes_read)) < 0) @@ -242,7 +242,7 @@ int ft2232_read(u8* buf, int size, u32* bytes_read) LOG_ERROR("couldn't read the requested number of bytes from FT2232 device (%i < %i)", *bytes_read, size); return ERROR_JTAG_DEVICE_ERROR; } - + return ERROR_OK; } @@ -255,7 +255,7 @@ int ft2232_speed(int speed) buf[0] = 0x86; /* command "set divisor" */ buf[1] = speed & 0xff; /* valueL (0=6MHz, 1=3MHz, 2=2.0MHz, ...*/ buf[2] = (speed >> 8) & 0xff; /* valueH */ - + LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); if (((retval = ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { @@ -268,12 +268,12 @@ int ft2232_speed(int speed) int ft2232_speed_div(int speed, int *khz) { - /* Take a look in the FT2232 manual, + /* Take a look in the FT2232 manual, * AN2232C-01 Command Processor for * MPSSE and MCU Host Bus. Chapter 3.8 */ - + *khz = 6000 / (1+speed); - + return ERROR_OK; } @@ -284,35 +284,35 @@ int ft2232_khz(int khz, int *jtag_speed) LOG_ERROR("RCLK not supported"); return ERROR_FAIL; } - /* Take a look in the FT2232 manual, + /* Take a look in the FT2232 manual, * AN2232C-01 Command Processor for * MPSSE and MCU Host Bus. Chapter 3.8 - * + * * We will calc here with a multiplier * of 10 for better rounding later. */ - + /* Calc speed, (6000 / khz) - 1 */ /* Use 65000 for better rounding */ *jtag_speed = (60000 / khz) - 10; - + /* Add 0.9 for rounding */ *jtag_speed += 9; - + /* Calc real speed */ *jtag_speed = *jtag_speed / 10; - + /* Check if speed is greater than 0 */ if (*jtag_speed < 0) { *jtag_speed = 0; } - + /* Check max value */ if (*jtag_speed > 0xFFFF) { *jtag_speed = 0xFFFF; } - + return ERROR_OK; } @@ -371,7 +371,7 @@ void ft2232_debug_dump_buffer(void) int i; char line[256]; char *line_p = line; - + for (i = 0; i < ft2232_buffer_size; i++) { line_p += snprintf(line_p, 256 - (line_p - line), "%2.2x ", ft2232_buffer[i]); @@ -381,7 +381,7 @@ void ft2232_debug_dump_buffer(void) line_p = line; } } - + if (line_p != line) LOG_DEBUG("%s", line); } @@ -395,7 +395,7 @@ int ft2232_send_and_recv(jtag_command_t *first, jtag_command_t *last) int retval; u32 bytes_written; u32 bytes_read; - + #ifdef _DEBUG_USB_IO_ struct timeval start, inter, inter2, end; struct timeval d_inter, d_inter2, d_end; @@ -407,7 +407,7 @@ int ft2232_send_and_recv(jtag_command_t *first, jtag_command_t *last) #endif #ifdef _DEBUG_USB_IO_ - gettimeofday(&start, NULL); + gettimeofday(&start, NULL); #endif if ((retval = ft2232_write(ft2232_buffer, ft2232_buffer_size, &bytes_written)) != ERROR_OK) @@ -415,28 +415,28 @@ int ft2232_send_and_recv(jtag_command_t *first, jtag_command_t *last) LOG_ERROR("couldn't write MPSSE commands to FT2232"); return retval; } - + #ifdef _DEBUG_USB_IO_ - gettimeofday(&inter, NULL); + gettimeofday(&inter, NULL); #endif - + if (ft2232_expect_read) { int timeout = 100; ft2232_buffer_size = 0; - + #ifdef _DEBUG_USB_IO_ - gettimeofday(&inter2, NULL); + gettimeofday(&inter2, NULL); #endif - + if ((retval = ft2232_read(ft2232_buffer, ft2232_expect_read, &bytes_read)) != ERROR_OK) { LOG_ERROR("couldn't read from FT2232"); return retval; } - + #ifdef _DEBUG_USB_IO_ - gettimeofday(&end, NULL); + gettimeofday(&end, NULL); timeval_subtract(&d_inter, &inter, &start); timeval_subtract(&d_inter2, &inter2, &start); @@ -444,14 +444,14 @@ int ft2232_send_and_recv(jtag_command_t *first, jtag_command_t *last) LOG_INFO("inter: %i.%i, inter2: %i.%i end: %i.%i", d_inter.tv_sec, d_inter.tv_usec, d_inter2.tv_sec, d_inter2.tv_usec, d_end.tv_sec, d_end.tv_usec); #endif - - + + ft2232_buffer_size = bytes_read; - + if (ft2232_expect_read != ft2232_buffer_size) { LOG_ERROR("ft2232_expect_read (%i) != ft2232_buffer_size (%i) (%i retries)", ft2232_expect_read, ft2232_buffer_size, 100 - timeout); - ft2232_debug_dump_buffer(); + ft2232_debug_dump_buffer(); exit(-1); } @@ -464,12 +464,12 @@ int ft2232_send_and_recv(jtag_command_t *first, jtag_command_t *last) ft2232_expect_read = 0; ft2232_read_pointer = 0; - + /* return ERROR_OK, unless a jtag_read_buffer returns a failed check * that wasn't handled by a caller-provided error handler - */ + */ retval = ERROR_OK; - + cmd = first; while (cmd != last) { @@ -492,7 +492,7 @@ int ft2232_send_and_recv(jtag_command_t *first, jtag_command_t *last) } cmd = cmd->next; } - + ft2232_buffer_size = 0; return retval; @@ -508,7 +508,7 @@ void ft2232_add_pathmove(pathmove_command_t *cmd) while (num_states) { int bit_count = 0; - + int num_states_batch = num_states > 7 ? 7 : num_states; tms_byte = 0x0; @@ -516,7 +516,7 @@ void ft2232_add_pathmove(pathmove_command_t *cmd) BUFFER_ADD = 0x4b; /* number of states remaining */ BUFFER_ADD = num_states_batch - 1; - + while (num_states_batch--) { if (tap_transitions[cur_state].low == cmd->path[state_count]) @@ -533,10 +533,10 @@ void ft2232_add_pathmove(pathmove_command_t *cmd) state_count++; num_states--; } - + BUFFER_ADD = tms_byte; } - + end_state = cur_state; } @@ -547,7 +547,7 @@ void ft2232_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size int cur_byte = 0; int last_bit; - if (!((!ir_scan && (cur_state == TAP_SD)) || (ir_scan && (cur_state == TAP_SI)))) + if (!((!ir_scan && (cur_state == TAP_DRSHIFT)) || (ir_scan && (cur_state == TAP_IRSHIFT)))) { /* command "Clock Data to TMS/CS Pin (no Read)" */ BUFFER_ADD = 0x4b; @@ -556,17 +556,17 @@ void ft2232_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size /* TMS data bits */ if (ir_scan) { - BUFFER_ADD = TAP_MOVE(cur_state, TAP_SI); - cur_state = TAP_SI; + BUFFER_ADD = TAP_MOVE(cur_state, TAP_IRSHIFT); + cur_state = TAP_IRSHIFT; } else { - BUFFER_ADD = TAP_MOVE(cur_state, TAP_SD); - cur_state = TAP_SD; + BUFFER_ADD = TAP_MOVE(cur_state, TAP_DRSHIFT); + cur_state = TAP_DRSHIFT; } /* LOG_DEBUG("added TMS scan (no read)"); */ } - + /* add command for complete bytes */ while (num_bytes > 1) { @@ -608,7 +608,7 @@ void ft2232_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size bits_left -= 8 * (thisrun_bytes); } } - + /* the most signifcant bit is scanned during TAP movement */ if (type != SCAN_IN) last_bit = (buffer[cur_byte] >> (bits_left - 1)) & 0x1; @@ -641,8 +641,8 @@ void ft2232_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size BUFFER_ADD = buffer[cur_byte]; } - if ((ir_scan && (end_state == TAP_SI)) || - (!ir_scan && (end_state == TAP_SD))) + if ((ir_scan && (end_state == TAP_IRSHIFT)) || + (!ir_scan && (end_state == TAP_DRSHIFT))) { if (type == SCAN_IO) { @@ -698,24 +698,24 @@ int ft2232_large_scan(scan_command_t *cmd, enum scan_type type, u8 *buffer, int u32 bytes_read; int retval; int thisrun_read = 0; - + if (cmd->ir_scan) { LOG_ERROR("BUG: large IR scans are not supported"); exit(-1); } - if (cur_state != TAP_SD) + if (cur_state != TAP_DRSHIFT) { /* command "Clock Data to TMS/CS Pin (no Read)" */ BUFFER_ADD = 0x4b; /* scan 7 bit */ BUFFER_ADD = 0x6; /* TMS data bits */ - BUFFER_ADD = TAP_MOVE(cur_state, TAP_SD); - cur_state = TAP_SD; + BUFFER_ADD = TAP_MOVE(cur_state, TAP_DRSHIFT); + cur_state = TAP_DRSHIFT; } - + if ((retval = ft2232_write(ft2232_buffer, ft2232_buffer_size, &bytes_written)) != ERROR_OK) { LOG_ERROR("couldn't write MPSSE commands to FT2232"); @@ -723,12 +723,12 @@ int ft2232_large_scan(scan_command_t *cmd, enum scan_type type, u8 *buffer, int } LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", ft2232_buffer_size, bytes_written); ft2232_buffer_size = 0; - + /* add command for complete bytes */ while (num_bytes > 1) { int thisrun_bytes; - + if (type == SCAN_IO) { /* Clock Data Bytes In and Out LSB First */ @@ -774,7 +774,7 @@ int ft2232_large_scan(scan_command_t *cmd, enum scan_type type, u8 *buffer, int } LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", ft2232_buffer_size, bytes_written); ft2232_buffer_size = 0; - + if (type != SCAN_OUT) { if ((retval = ft2232_read(receive_pointer, thisrun_read, &bytes_read)) != ERROR_OK) @@ -786,9 +786,9 @@ int ft2232_large_scan(scan_command_t *cmd, enum scan_type type, u8 *buffer, int receive_pointer += bytes_read; } } - + thisrun_read = 0; - + /* the most signifcant bit is scanned during TAP movement */ if (type != SCAN_IN) last_bit = (buffer[cur_byte] >> (bits_left - 1)) & 0x1; @@ -819,12 +819,12 @@ int ft2232_large_scan(scan_command_t *cmd, enum scan_type type, u8 *buffer, int BUFFER_ADD = bits_left - 2; if (type != SCAN_IN) BUFFER_ADD = buffer[cur_byte]; - + if (type != SCAN_OUT) thisrun_read += 2; } - if (end_state == TAP_SD) + if (end_state == TAP_DRSHIFT) { if (type == SCAN_IO) { @@ -866,10 +866,10 @@ int ft2232_large_scan(scan_command_t *cmd, enum scan_type type, u8 *buffer, int BUFFER_ADD = TAP_MOVE(cur_state, end_state) | (last_bit << 7); cur_state = end_state; } - + if (type != SCAN_OUT) thisrun_read += 1; - + if ((retval = ft2232_write(ft2232_buffer, ft2232_buffer_size, &bytes_written)) != ERROR_OK) { LOG_ERROR("couldn't write MPSSE commands to FT2232"); @@ -877,7 +877,7 @@ int ft2232_large_scan(scan_command_t *cmd, enum scan_type type, u8 *buffer, int } LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", ft2232_buffer_size, bytes_written); ft2232_buffer_size = 0; - + if (type != SCAN_OUT) { if ((retval = ft2232_read(receive_pointer, thisrun_read, &bytes_read)) != ERROR_OK) @@ -888,7 +888,7 @@ int ft2232_large_scan(scan_command_t *cmd, enum scan_type type, u8 *buffer, int LOG_DEBUG("thisrun_read: %i, bytes_read: %i", thisrun_read, bytes_read); receive_pointer += bytes_read; } - + return ERROR_OK; } @@ -896,10 +896,10 @@ int ft2232_predict_scan_out(int scan_size, enum scan_type type) { int predicted_size = 3; int num_bytes = (scan_size - 1) / 8; - - if (cur_state != TAP_SD) + + if (cur_state != TAP_DRSHIFT) predicted_size += 3; - + if (type == SCAN_IN) /* only from device to host */ { /* complete bytes */ @@ -921,7 +921,7 @@ int ft2232_predict_scan_out(int scan_size, enum scan_type type) int ft2232_predict_scan_in(int scan_size, enum scan_type type) { int predicted_size = 0; - + if (type != SCAN_OUT) { /* complete bytes */ @@ -931,7 +931,7 @@ int ft2232_predict_scan_in(int scan_size, enum scan_type type) /* last bit (from TMS scan) */ predicted_size += 1; } - + /* LOG_DEBUG("scan_size: %i, predicted_size: %i", scan_size, predicted_size); */ return predicted_size; @@ -968,7 +968,7 @@ void usbjtag_reset(int trst, int srst) else low_direction &= ~nSRSTnOE; /* switch to input pin (high-Z) */ } - + /* command "set data bits low byte" */ BUFFER_ADD = 0x80; BUFFER_ADD = low_output; @@ -1007,7 +1007,7 @@ void jtagkey_reset(int trst, int srst) else high_output |= nSRSTnOE; } - + /* command "set data bits high byte" */ BUFFER_ADD = 0x82; BUFFER_ADD = high_output; @@ -1052,7 +1052,7 @@ void axm0432_jtag_reset(int trst, int srst) { if (trst == 1) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; high_output &= ~nTRST; } else if (trst == 0) @@ -1106,7 +1106,7 @@ void flyswatter_reset(int trst, int srst) void turtle_reset(int trst, int srst) { trst = trst; - + if (srst == 1) { low_output |= nSRST; @@ -1115,7 +1115,7 @@ void turtle_reset(int trst, int srst) { low_output &= ~nSRST; } - + /* command "set data bits low byte" */ BUFFER_ADD = 0x80; BUFFER_ADD = low_output; @@ -1142,7 +1142,7 @@ void comstick_reset(int trst, int srst) { high_output |= nSRST; } - + /* command "set data bits high byte" */ BUFFER_ADD = 0x82; BUFFER_ADD = high_output; @@ -1169,12 +1169,12 @@ void stm32stick_reset(int trst, int srst) { low_output |= nSRST; } - + /* command "set data bits low byte" */ BUFFER_ADD = 0x80; BUFFER_ADD = low_output; BUFFER_ADD = low_direction; - + /* command "set data bits high byte" */ BUFFER_ADD = 0x82; BUFFER_ADD = high_output; @@ -1193,15 +1193,15 @@ int ft2232_execute_queue() int predicted_size = 0; int require_send = 0; int retval; - + /* return ERROR_OK, unless ft2232_send_and_recv reports a failed check * that wasn't handled by a caller-provided error handler - */ + */ retval = ERROR_OK; ft2232_buffer_size = 0; ft2232_expect_read = 0; - + /* blink, if the current layout has that feature */ if (layout->blink) layout->blink(); @@ -1227,24 +1227,24 @@ int ft2232_execute_queue() if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST))) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; } layout->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); require_send = 1; - -#ifdef _DEBUG_JTAG_IO_ + +#ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("trst: %i, srst: %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst); #endif break; case JTAG_RUNTEST: /* only send the maximum buffer size that FT2232C can handle */ predicted_size = 0; - if (cur_state != TAP_RTI) + if (cur_state != TAP_IDLE) predicted_size += 3; predicted_size += 3 * CEIL(cmd->cmd.runtest->num_cycles, 7); - if ((cmd->cmd.runtest->end_state != -1) && (cmd->cmd.runtest->end_state != TAP_RTI)) + if ((cmd->cmd.runtest->end_state != -1) && (cmd->cmd.runtest->end_state != TAP_IDLE)) predicted_size += 3; - if ((cmd->cmd.runtest->end_state == -1) && (end_state != TAP_RTI)) + if ((cmd->cmd.runtest->end_state == -1) && (end_state != TAP_IDLE)) predicted_size += 3; if (ft2232_buffer_size + predicted_size + 1 > FT2232_BUFFER_SIZE) { @@ -1253,15 +1253,15 @@ int ft2232_execute_queue() require_send = 0; first_unsent = cmd; } - if (cur_state != TAP_RTI) + if (cur_state != TAP_IDLE) { /* command "Clock Data to TMS/CS Pin (no Read)" */ BUFFER_ADD = 0x4b; /* scan 7 bit */ BUFFER_ADD = 0x6; /* TMS data bits */ - BUFFER_ADD = TAP_MOVE(cur_state, TAP_RTI); - cur_state = TAP_RTI; + BUFFER_ADD = TAP_MOVE(cur_state, TAP_IDLE); + cur_state = TAP_IDLE; require_send = 1; } i = cmd->cmd.runtest->num_cycles; @@ -1273,7 +1273,7 @@ int ft2232_execute_queue() BUFFER_ADD = (i > 7) ? 6 : (i - 1); /* TMS data bits */ BUFFER_ADD = 0x0; - cur_state = TAP_RTI; + cur_state = TAP_IDLE; i -= (i > 7) ? 7 : i; /* LOG_DEBUG("added TMS scan (no read)"); */ } @@ -1291,7 +1291,7 @@ int ft2232_execute_queue() /* LOG_DEBUG("added TMS scan (no read)"); */ } require_send = 1; -#ifdef _DEBUG_JTAG_IO_ +#ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("runtest: %i, end in %i", cmd->cmd.runtest->num_cycles, end_state); #endif break; @@ -1316,7 +1316,7 @@ int ft2232_execute_queue() /* LOG_DEBUG("added TMS scan (no read)"); */ cur_state = end_state; require_send = 1; -#ifdef _DEBUG_JTAG_IO_ +#ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("statemove: %i", end_state); #endif break; @@ -1332,7 +1332,7 @@ int ft2232_execute_queue() } ft2232_add_pathmove(cmd->cmd.pathmove); require_send = 1; -#ifdef _DEBUG_JTAG_IO_ +#ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("pathmove: %i states, end in %i", cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]); #endif break; @@ -1347,7 +1347,7 @@ int ft2232_execute_queue() if (first_unsent != cmd) if (ft2232_send_and_recv(first_unsent, cmd) != ERROR_OK) retval = ERROR_JTAG_QUEUE_FAILED; - + /* current command */ if (cmd->cmd.scan->end_state != -1) ft2232_end_state(cmd->cmd.scan->end_state); @@ -1374,7 +1374,7 @@ int ft2232_execute_queue() require_send = 1; if (buffer) free(buffer); -#ifdef _DEBUG_JTAG_IO_ +#ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("%s scan, %i bit, end in %i", (cmd->cmd.scan->ir_scan) ? "IR" : "DR", scan_size, end_state); #endif break; @@ -1383,7 +1383,7 @@ int ft2232_execute_queue() retval = ERROR_JTAG_QUEUE_FAILED; first_unsent = cmd->next; jtag_sleep(cmd->cmd.sleep->us); -#ifdef _DEBUG_JTAG_IO_ +#ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("sleep %i usec", cmd->cmd.sleep->us); #endif break; @@ -1424,7 +1424,7 @@ static int ft2232_init_ftd2xx(u16 vid, u16 pid, int more, int *try_more) LOG_WARNING("can't open by device description and serial number, giving precedence to serial"); ft2232_device_desc = NULL; } - + if (ft2232_device_desc) { openex_string = ft2232_device_desc; @@ -1439,14 +1439,14 @@ static int ft2232_init_ftd2xx(u16 vid, u16 pid, int more, int *try_more) { LOG_ERROR("neither device description nor serial number specified"); LOG_ERROR("please add \"ft2232_device_desc \" or \"ft2232_serial \" to your .cfg file"); - - return ERROR_JTAG_INIT_FAILED; + + return ERROR_JTAG_INIT_FAILED; } if ((status = FT_OpenEx(openex_string, openex_flags, &ftdih)) != FT_OK) { DWORD num_devices; - + if (more) { LOG_WARNING("unable to open ftdi device (trying more): %lu", status); *try_more = 1; @@ -1471,7 +1471,7 @@ static int ft2232_init_ftd2xx(u16 vid, u16 pid, int more, int *try_more) for (i = 0; i < num_devices; i++) LOG_ERROR("%i: %s", i, desc_array[i]); } - + for (i = 0; i < num_devices; i++) free(desc_array[i]); free(desc_array); @@ -1488,7 +1488,7 @@ static int ft2232_init_ftd2xx(u16 vid, u16 pid, int more, int *try_more) LOG_ERROR("unable to set latency timer: %lu", status); return ERROR_JTAG_INIT_FAILED; } - + if ((status = FT_GetLatencyTimer(ftdih, &latency_timer)) != FT_OK) { LOG_ERROR("unable to get latency timer: %lu", status); @@ -1498,7 +1498,7 @@ static int ft2232_init_ftd2xx(u16 vid, u16 pid, int more, int *try_more) { LOG_DEBUG("current latency timer: %i", latency_timer); } - + if ((status = FT_SetTimeouts(ftdih, 5000, 5000)) != FT_OK) { LOG_ERROR("unable to set timeouts: %lu", status); @@ -1568,7 +1568,7 @@ static int ft2232_init_libftdi(u16 vid, u16 pid, int more, int *try_more) LOG_ERROR("unable to set latency timer"); return ERROR_JTAG_INIT_FAILED; } - + if (ftdi_get_latency_timer(&ftdic, &latency_timer) < 0) { LOG_ERROR("unable to get latency timer"); @@ -1603,13 +1603,13 @@ int ft2232_init(void) u32 bytes_written; ft2232_layout_t *cur_layout = ft2232_layouts; int i; - + if ((ft2232_layout == NULL) || (ft2232_layout[0] == 0)) { ft2232_layout = "usbjtag"; LOG_WARNING("No ft2232 layout specified, using default 'usbjtag'"); } - + while (cur_layout->name) { if (strcmp(cur_layout->name, ft2232_layout) == 0) @@ -1625,7 +1625,7 @@ int ft2232_init(void) LOG_ERROR("No matching layout found for %s", ft2232_layout); return ERROR_JTAG_INIT_FAILED; } - + for (i = 0; 1; i++) { /* * "more indicates that there are more IDs to try, so we should @@ -1645,7 +1645,7 @@ int ft2232_init(void) #elif BUILD_FT2232_LIBFTDI == 1 retval = ft2232_init_libftdi(ft2232_vid[i], ft2232_pid[i], more, &try_more); -#endif +#endif if (retval >= 0) break; if (!more || !try_more) @@ -1671,7 +1671,7 @@ int ft2232_init(void) return ft2232_purge_ftd2xx(); #elif BUILD_FT2232_LIBFTDI == 1 return ft2232_purge_libftdi(); -#endif +#endif return ERROR_OK; } @@ -1680,10 +1680,10 @@ int usbjtag_init(void) { u8 buf[3]; u32 bytes_written; - + low_output = 0x08; low_direction = 0x0b; - + if (strcmp(ft2232_layout, "usbjtag") == 0) { nTRST = 0x10; @@ -1710,9 +1710,9 @@ int usbjtag_init(void) else { LOG_ERROR("BUG: usbjtag_init called for unknown layout '%s'", ft2232_layout); - return ERROR_JTAG_INIT_FAILED; + return ERROR_JTAG_INIT_FAILED; } - + if (jtag_reset_config & RESET_TRST_OPEN_DRAIN) { low_direction &= ~nTRSTnOE; /* nTRST input */ @@ -1723,7 +1723,7 @@ int usbjtag_init(void) low_direction |= nTRSTnOE; /* nTRST output */ low_output |= nTRST; /* nTRST = 1 */ } - + if (jtag_reset_config & RESET_SRST_PUSH_PULL) { low_direction |= nSRSTnOE; /* nSRST output */ @@ -1734,16 +1734,16 @@ int usbjtag_init(void) low_direction &= ~nSRSTnOE; /* nSRST input */ low_output &= ~nSRST; /* nSRST = 0 */ } - + /* initialize low byte for jtag */ buf[0] = 0x80; /* command "set data bits low byte" */ buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, xRST high) */ buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'USBJTAG' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'USBJTAG' layout"); return ERROR_JTAG_INIT_FAILED; } @@ -1754,19 +1754,19 @@ int axm0432_jtag_init(void) { u8 buf[3]; u32 bytes_written; - + low_output = 0x08; low_direction = 0x2b; - + /* initialize low byte for jtag */ buf[0] = 0x80; /* command "set data bits low byte" */ buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, nOE=0) */ buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); return ERROR_JTAG_INIT_FAILED; } @@ -1775,14 +1775,14 @@ int axm0432_jtag_init(void) nTRST = 0x08; nTRSTnOE = 0x0; /* No output enable for TRST*/ nSRST = 0x04; - nSRSTnOE = 0x0; /* No output enable for SRST*/ + nSRSTnOE = 0x0; /* No output enable for SRST*/ } else { LOG_ERROR("BUG: axm0432_jtag_init called for non axm0432 layout"); exit(-1); } - + high_output = 0x0; high_direction = 0x0c; @@ -1803,19 +1803,19 @@ int axm0432_jtag_init(void) { high_output |= nSRST; } - + /* initialize high port */ buf[0] = 0x82; /* command "set data bits high byte" */ buf[1] = high_output; /* value */ buf[2] = high_direction; /* all outputs (xRST and xRSTnOE) */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'Dicarlo' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'Dicarlo' layout"); return ERROR_JTAG_INIT_FAILED; } - + return ERROR_OK; } @@ -1823,22 +1823,22 @@ int jtagkey_init(void) { u8 buf[3]; u32 bytes_written; - + low_output = 0x08; low_direction = 0x1b; - + /* initialize low byte for jtag */ buf[0] = 0x80; /* command "set data bits low byte" */ buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, nOE=0) */ buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); return ERROR_JTAG_INIT_FAILED; } - + if (strcmp(layout->name, "jtagkey") == 0) { nTRST = 0x01; @@ -1859,7 +1859,7 @@ int jtagkey_init(void) LOG_ERROR("BUG: jtagkey_init called for non jtagkey layout"); exit(-1); } - + high_output = 0x0; high_direction = 0x0f; @@ -1873,7 +1873,7 @@ int jtagkey_init(void) high_output &= ~nTRSTnOE; high_output |= nTRST; } - + if (jtag_reset_config & RESET_SRST_PUSH_PULL) { high_output &= ~nSRSTnOE; @@ -1884,19 +1884,19 @@ int jtagkey_init(void) high_output |= nSRSTnOE; high_output &= ~nSRST; } - + /* initialize high port */ buf[0] = 0x82; /* command "set data bits high byte" */ buf[1] = high_output; /* value */ buf[2] = high_direction; /* all outputs (xRST and xRSTnOE) */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); return ERROR_JTAG_INIT_FAILED; } - + return ERROR_OK; } @@ -1904,22 +1904,22 @@ int olimex_jtag_init(void) { u8 buf[3]; u32 bytes_written; - + low_output = 0x08; low_direction = 0x1b; - + /* initialize low byte for jtag */ buf[0] = 0x80; /* command "set data bits low byte" */ buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, nOE=0) */ buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); return ERROR_JTAG_INIT_FAILED; } - + nTRST = 0x01; nTRSTnOE = 0x4; nSRST = 0x02; @@ -1938,7 +1938,7 @@ int olimex_jtag_init(void) high_output &= ~nTRSTnOE; high_output |= nTRST; } - + if (jtag_reset_config & RESET_SRST_PUSH_PULL) { LOG_ERROR("can't set nSRST to push-pull on the Olimex ARM-USB-OCD"); @@ -1947,22 +1947,22 @@ int olimex_jtag_init(void) { high_output &= ~nSRST; } - + /* turn red LED on */ high_output |= 0x08; - + /* initialize high port */ buf[0] = 0x82; /* command "set data bits high byte" */ buf[1] = high_output; /* value */ buf[2] = high_direction; /* all outputs (xRST and xRSTnOE) */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'JTAGkey' layout"); return ERROR_JTAG_INIT_FAILED; } - + return ERROR_OK; } @@ -1970,22 +1970,22 @@ int flyswatter_init(void) { u8 buf[3]; u32 bytes_written; - + low_output = 0x18; low_direction = 0xfb; - + /* initialize low byte for jtag */ buf[0] = 0x80; /* command "set data bits low byte" */ buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, nOE=0) */ buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE[12]=out, n[ST]srst=out */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'flyswatter' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'flyswatter' layout"); return ERROR_JTAG_INIT_FAILED; } - + nTRST = 0x10; nTRSTnOE = 0x0; /* not output enable for nTRST */ nSRST = 0x20; @@ -1996,19 +1996,19 @@ int flyswatter_init(void) /* turn red LED1 on, LED2 off */ high_output |= 0x08; - + /* initialize high port */ buf[0] = 0x82; /* command "set data bits high byte" */ buf[1] = high_output; /* value */ buf[2] = high_direction; /* all outputs (xRST and xRSTnOE) */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'flyswatter' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'flyswatter' layout"); return ERROR_JTAG_INIT_FAILED; } - + return ERROR_OK; } @@ -2016,39 +2016,39 @@ int turtle_init(void) { u8 buf[3]; u32 bytes_written; - + low_output = 0x08; low_direction = 0x5b; - + /* initialize low byte for jtag */ buf[0] = 0x80; /* command "set data bits low byte" */ buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, nOE=0) */ buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'turtelizer2' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'turtelizer2' layout"); return ERROR_JTAG_INIT_FAILED; } - + nSRST = 0x40; - + high_output = 0x00; high_direction = 0x0C; - + /* initialize high port */ buf[0] = 0x82; /* command "set data bits high byte" */ buf[1] = high_output; buf[2] = high_direction; LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'turtelizer2' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'turtelizer2' layout"); return ERROR_JTAG_INIT_FAILED; } - + return ERROR_OK; } @@ -2056,42 +2056,42 @@ int comstick_init(void) { u8 buf[3]; u32 bytes_written; - + low_output = 0x08; low_direction = 0x0b; - + /* initialize low byte for jtag */ buf[0] = 0x80; /* command "set data bits low byte" */ buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, nOE=0) */ buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'comstick' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'comstick' layout"); return ERROR_JTAG_INIT_FAILED; } - + nTRST = 0x01; nTRSTnOE = 0x00; /* no output enable for nTRST */ nSRST = 0x02; nSRSTnOE = 0x00; /* no output enable for nSRST */ - + high_output = 0x03; high_direction = 0x03; - + /* initialize high port */ buf[0] = 0x82; /* command "set data bits high byte" */ buf[1] = high_output; buf[2] = high_direction; LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'comstick' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'comstick' layout"); return ERROR_JTAG_INIT_FAILED; } - + return ERROR_OK; } @@ -2099,42 +2099,42 @@ int stm32stick_init(void) { u8 buf[3]; u32 bytes_written; - + low_output = 0x88; low_direction = 0x8b; - + /* initialize low byte for jtag */ buf[0] = 0x80; /* command "set data bits low byte" */ buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, nOE=0) */ buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */ LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'stm32stick' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'stm32stick' layout"); return ERROR_JTAG_INIT_FAILED; } - + nTRST = 0x01; nTRSTnOE = 0x00; /* no output enable for nTRST */ nSRST = 0x80; nSRSTnOE = 0x00; /* no output enable for nSRST */ - + high_output = 0x01; high_direction = 0x03; - + /* initialize high port */ buf[0] = 0x82; /* command "set data bits high byte" */ buf[1] = high_output; buf[2] = high_direction; LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); - + if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) { - LOG_ERROR("couldn't initialize FT2232 with 'stm32stick' layout"); + LOG_ERROR("couldn't initialize FT2232 with 'stm32stick' layout"); return ERROR_JTAG_INIT_FAILED; } - + return ERROR_OK; } @@ -2153,7 +2153,7 @@ void olimex_jtag_blink(void) /* set port pin low */ high_output |= 0x08; } - + BUFFER_ADD = 0x82; BUFFER_ADD = high_output; BUFFER_ADD = high_direction; @@ -2161,7 +2161,7 @@ void olimex_jtag_blink(void) void turtle_jtag_blink(void) { - /* + /* * Turtelizer2 has two LEDs connected to ACBUS2 and ACBUS3 */ if (high_output & 0x08) @@ -2172,7 +2172,7 @@ void turtle_jtag_blink(void) { high_output = 0x08; } - + BUFFER_ADD = 0x82; BUFFER_ADD = high_output; BUFFER_ADD = high_direction; @@ -2186,9 +2186,9 @@ int ft2232_quit(void) status = FT_Close(ftdih); #elif BUILD_FT2232_LIBFTDI == 1 ftdi_disable_bitbang(&ftdic); - + ftdi_usb_close(&ftdic); - + ftdi_deinit(&ftdic); #endif @@ -2208,7 +2208,7 @@ int ft2232_handle_device_desc_command(struct command_context_s *cmd_ctx, char *c { LOG_ERROR("expected exactly one argument to ft2232_device_desc "); } - + return ERROR_OK; } @@ -2222,7 +2222,7 @@ int ft2232_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, c { LOG_ERROR("expected exactly one argument to ft2232_serial "); } - + return ERROR_OK; } @@ -2276,6 +2276,6 @@ int ft2232_handle_latency_command(struct command_context_s *cmd_ctx, char *cmd, { LOG_ERROR("expected exactly one argument to ft2232_latency "); } - + return ERROR_OK; } diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c index b964a23a..506b5a60 100644 --- a/src/jtag/gw16012.c +++ b/src/jtag/gw16012.c @@ -97,13 +97,13 @@ int gw16012_quit(void); int gw16012_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -jtag_interface_t gw16012_interface = +jtag_interface_t gw16012_interface = { .name = "gw16012", - + .execute_queue = gw16012_execute_queue, - .speed = gw16012_speed, + .speed = gw16012_speed, .register_commands = gw16012_register_commands, .init = gw16012_init, .quit = gw16012_quit, @@ -113,7 +113,7 @@ int gw16012_register_commands(struct command_context_s *cmd_ctx) { register_command(cmd_ctx, NULL, "parport_port", gw16012_handle_parport_port_command, COMMAND_CONFIG, NULL); - + return ERROR_OK; } @@ -125,7 +125,7 @@ void gw16012_data(u8 value) #ifdef _DEBUG_GW16012_IO_ LOG_DEBUG("%2.2x", value); #endif - + #if PARPORT_USE_PPDEV == 1 ioctl(device_handle, PPWDATA, &value); #else @@ -134,7 +134,7 @@ void gw16012_data(u8 value) #else outb(value, gw16012_port); #endif - #endif + #endif } void gw16012_control(u8 value) @@ -209,15 +209,15 @@ void gw16012_state_move(void) { int i=0, tms=0; u8 tms_scan = TAP_MOVE(cur_state, end_state); - + gw16012_control(0x0); /* single-bit mode */ - + for (i = 0; i < 7; i++) { tms = (tms_scan >> i) & 1; gw16012_data(tms << 1); /* output next TMS bit */ } - + cur_state = end_state; } @@ -243,12 +243,12 @@ void gw16012_path_move(pathmove_command_t *cmd) LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[state_count]]); exit(-1); } - + cur_state = cmd->path[state_count]; state_count++; num_states--; } - + end_state = cur_state; } @@ -256,20 +256,20 @@ void gw16012_runtest(int num_cycles) { enum tap_state saved_end_state = end_state; int i; - + /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_RTI) + if (cur_state != TAP_IDLE) { - gw16012_end_state(TAP_RTI); + gw16012_end_state(TAP_IDLE); gw16012_state_move(); } - + for (i = 0; i < num_cycles; i++) { gw16012_control(0x0); /* single-bit mode */ gw16012_data(0x0); /* TMS cycle with TMS low */ } - + gw16012_end_state(saved_end_state); if (cur_state != end_state) gw16012_state_move(); @@ -283,12 +283,12 @@ void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) u8 scan_out, scan_in; /* only if we're not already in the correct Shift state */ - if (!((!ir_scan && (cur_state == TAP_SD)) || (ir_scan && (cur_state == TAP_SI)))) + if (!((!ir_scan && (cur_state == TAP_DRSHIFT)) || (ir_scan && (cur_state == TAP_IRSHIFT)))) { if (ir_scan) - gw16012_end_state(TAP_SI); + gw16012_end_state(TAP_IRSHIFT); else - gw16012_end_state(TAP_SD); + gw16012_end_state(TAP_DRSHIFT); gw16012_state_move(); gw16012_end_state(saved_end_state); @@ -302,20 +302,20 @@ void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) bit_count += 7; bits_left -= 7; } - + gw16012_control(0x0); /* single-bit mode */ while (bits_left-- > 0) { u8 tms = 0; - + scan_out = buf_get_u32(buffer, bit_count, 1); - + if (bits_left == 0) /* last bit */ { - if ((ir_scan && (end_state == TAP_SI)) - || (!ir_scan && (end_state == TAP_SD))) + if ((ir_scan && (end_state == TAP_IRSHIFT)) + || (!ir_scan && (end_state == TAP_DRSHIFT))) { - tms = 0; + tms = 0; } else { @@ -329,20 +329,20 @@ void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) { gw16012_input(&scan_in); buf_set_u32(buffer, bit_count, 1, ((scan_in & 0x08) >> 3)); - } + } bit_count++; } - if (!((ir_scan && (end_state == TAP_SI)) || - (!ir_scan && (end_state == TAP_SD)))) + if (!((ir_scan && (end_state == TAP_IRSHIFT)) || + (!ir_scan && (end_state == TAP_DRSHIFT)))) { gw16012_data(0x0); if (ir_scan) - cur_state = TAP_PI; + cur_state = TAP_IRPAUSE; else - cur_state = TAP_PD; - + cur_state = TAP_DRPAUSE; + if (cur_state != end_state) gw16012_state_move(); } @@ -355,12 +355,12 @@ int gw16012_execute_queue(void) enum scan_type type; u8 *buffer; int retval; - + /* return ERROR_OK, unless a jtag_read_buffer returns a failed check * that wasn't handled by a caller-provided error handler - */ + */ retval = ERROR_OK; - + while (cmd) { switch (cmd->type) @@ -378,7 +378,7 @@ int gw16012_execute_queue(void) #endif if (cmd->cmd.reset->trst == 1) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; } gw16012_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; @@ -410,7 +410,7 @@ int gw16012_execute_queue(void) scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer); type = jtag_scan_type(cmd->cmd.scan); #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("%s scan (%i) %i bit end in %i", (cmd->cmd.scan->ir_scan) ? "ir" : "dr", + LOG_DEBUG("%s scan (%i) %i bit end in %i", (cmd->cmd.scan->ir_scan) ? "ir" : "dr", type, scan_size, cmd->cmd.scan->end_state); #endif gw16012_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size); @@ -431,7 +431,7 @@ int gw16012_execute_queue(void) } cmd = cmd->next; } - + return retval; } @@ -443,16 +443,16 @@ int gw16012_get_giveio_access() version.dwOSVersionInfoSize = sizeof version; if (!GetVersionEx( &version )) { - errno = EINVAL; - return -1; + errno = EINVAL; + return -1; } if (version.dwPlatformId != VER_PLATFORM_WIN32_NT) - return 0; + return 0; h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); if (h == INVALID_HANDLE_VALUE) { - errno = ENODEV; - return -1; + errno = ENODEV; + return -1; } CloseHandle( h ); @@ -468,7 +468,7 @@ int gw16012_init(void) int i = 0; #endif u8 status_port; - + #if PARPORT_USE_PPDEV == 1 if (device_handle>0) { @@ -486,7 +486,7 @@ int gw16012_init(void) snprintf(buffer, 256, "/dev/parport%d", gw16012_port); device_handle = open(buffer, O_WRONLY); -#endif +#endif if (device_handle<0) { LOG_ERROR("cannot open device. check it exists and that user read and write rights are set"); @@ -525,7 +525,7 @@ int gw16012_init(void) gw16012_port = 0x378; LOG_WARNING("No gw16012 port specified, using default '0x378' (LPT1)"); } - + LOG_DEBUG("requesting privileges for parallel port 0x%lx...", (long unsigned)(gw16012_port) ); #if PARPORT_USE_GIVEIO == 1 if (gw16012_get_giveio_access() != 0) @@ -545,19 +545,19 @@ int gw16012_init(void) outb(0x0, gw16012_port + 2); #endif #endif /* PARPORT_USE_PPDEV */ - + gw16012_input(&status_port); gw16012_msb = (status_port & 0x80) ^ 0x80; - + gw16012_speed(jtag_speed); gw16012_reset(0, 0); - + return ERROR_OK; } int gw16012_quit(void) { - + return ERROR_OK; } diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index 7f16f365..6d40b56d 100644 --- a/src/jtag/jlink.c +++ b/src/jtag/jlink.c @@ -146,92 +146,92 @@ int jlink_execute_queue(void) int scan_size; enum scan_type type; u8 *buffer; - + while (cmd != NULL) { switch (cmd->type) { case JTAG_END_STATE: DEBUG_JTAG_IO("end_state: %i", cmd->cmd.end_state->end_state); - + if (cmd->cmd.end_state->end_state != -1) { jlink_end_state(cmd->cmd.end_state->end_state); } break; - + case JTAG_RUNTEST: DEBUG_JTAG_IO( "runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \ cmd->cmd.runtest->end_state); - + if (cmd->cmd.runtest->end_state != -1) { jlink_end_state(cmd->cmd.runtest->end_state); } jlink_runtest(cmd->cmd.runtest->num_cycles); break; - + case JTAG_STATEMOVE: DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state); - + if (cmd->cmd.statemove->end_state != -1) { jlink_end_state(cmd->cmd.statemove->end_state); } jlink_state_move(); break; - + case JTAG_PATHMOVE: DEBUG_JTAG_IO("pathmove: %i states, end in %i", \ cmd->cmd.pathmove->num_states, \ cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]); - + jlink_path_move(cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path); break; - + case JTAG_SCAN: DEBUG_JTAG_IO("scan end in %i", cmd->cmd.scan->end_state); - + if (cmd->cmd.scan->end_state != -1) { jlink_end_state(cmd->cmd.scan->end_state); } - + scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer); DEBUG_JTAG_IO("scan input, length = %d", scan_size); - + #ifdef _DEBUG_USB_COMMS_ jlink_debug_buffer(buffer, (scan_size + 7) / 8); #endif type = jtag_scan_type(cmd->cmd.scan); jlink_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size, cmd->cmd.scan); break; - + case JTAG_RESET: DEBUG_JTAG_IO("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst); - + jlink_tap_execute(); - + if (cmd->cmd.reset->trst == 1) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; } jlink_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; - + case JTAG_SLEEP: DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us); jlink_tap_execute(); jtag_sleep(cmd->cmd.sleep->us); break; - + default: LOG_ERROR("BUG: unknown JTAG command type encountered"); exit(-1); } cmd = cmd->next; } - + return jlink_tap_execute(); } @@ -239,19 +239,19 @@ int jlink_execute_queue(void) int jlink_speed(int speed) { int result; - + if (speed <= JLINK_MAX_SPEED) { /* check for RTCK setting */ if (speed == 0) speed = -1; - + usb_out_buffer[0] = EMU_CMD_SET_SPEED; usb_out_buffer[1] = (speed >> 0) & 0xff; usb_out_buffer[2] = (speed >> 8) & 0xff; - + result = jlink_usb_write(jlink_jtag_handle, 3); - + if (result == 3) { return ERROR_OK; @@ -266,14 +266,14 @@ int jlink_speed(int speed) { LOG_INFO("Requested speed %dkHz exceeds maximum of %dkHz, ignored", speed, JLINK_MAX_SPEED); } - + return ERROR_OK; } int jlink_khz(int khz, int *jtag_speed) { *jtag_speed = khz; - + return ERROR_OK; } @@ -286,16 +286,16 @@ int jlink_register_commands(struct command_context_s *cmd_ctx) int jlink_init(void) { - int check_cnt; - + int check_cnt; + jlink_jtag_handle = jlink_usb_open(); - + if (jlink_jtag_handle == 0) { LOG_ERROR("Cannot find jlink Interface! Please check connection and permissions."); return ERROR_JTAG_INIT_FAILED; } - + check_cnt = 0; while (check_cnt < 3) { @@ -305,7 +305,7 @@ int jlink_init(void) jlink_get_status(); break; } - + check_cnt++; } @@ -313,12 +313,12 @@ int jlink_init(void) { LOG_INFO("J-Link initial read failed, don't worry"); } - + LOG_INFO("J-Link JTAG Interface ready"); - + jlink_reset(0, 0); jlink_tap_init(); - + return ERROR_OK; } @@ -350,20 +350,20 @@ void jlink_state_move(void) int i; int tms = 0; u8 tms_scan = TAP_MOVE(cur_state, end_state); - + for (i = 0; i < 7; i++) { tms = (tms_scan >> i) & 1; jlink_tap_append_step(tms, 0); } - + cur_state = end_state; } void jlink_path_move(int num_states, enum tap_state *path) { int i; - + for (i = 0; i < num_states; i++) { if (path[i] == tap_transitions[cur_state].low) @@ -379,32 +379,32 @@ void jlink_path_move(int num_states, enum tap_state *path) LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[path[i]]); exit(-1); } - + cur_state = path[i]; } - + end_state = cur_state; } void jlink_runtest(int num_cycles) { int i; - + enum tap_state saved_end_state = end_state; - + /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_RTI) + if (cur_state != TAP_IDLE) { - jlink_end_state(TAP_RTI); + jlink_end_state(TAP_IDLE); jlink_state_move(); } - + /* execute num_cycles */ for (i = 0; i < num_cycles; i++) { jlink_tap_append_step(0, 0); } - + /* finish in end_state */ jlink_end_state(saved_end_state); if (cur_state != end_state) @@ -416,25 +416,25 @@ void jlink_runtest(int num_cycles) void jlink_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command) { enum tap_state saved_end_state; - + jlink_tap_ensure_space(1, scan_size + 8); - + saved_end_state = end_state; - + /* Move to appropriate scan state */ - jlink_end_state(ir_scan ? TAP_SI : TAP_SD); - + jlink_end_state(ir_scan ? TAP_IRSHIFT : TAP_DRSHIFT); + jlink_state_move(); jlink_end_state(saved_end_state); - + /* Scan */ jlink_tap_append_scan(scan_size, buffer, command); - + /* We are in Exit1, go to Pause */ jlink_tap_append_step(0, 0); - - cur_state = ir_scan ? TAP_PI : TAP_PD; - + + cur_state = ir_scan ? TAP_IRPAUSE : TAP_DRPAUSE; + if (cur_state != end_state) { jlink_state_move(); @@ -444,7 +444,7 @@ void jlink_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, sca void jlink_reset(int trst, int srst) { LOG_DEBUG("trst: %i, srst: %i", trst, srst); - + /* Signals are active low */ if (srst == 0) { @@ -454,7 +454,7 @@ void jlink_reset(int trst, int srst) { jlink_simple_command(EMU_CMD_HW_RESET0); } - + if (trst == 0) { jlink_simple_command(EMU_CMD_HW_TRST1); @@ -468,12 +468,12 @@ void jlink_reset(int trst, int srst) void jlink_simple_command(u8 command) { int result; - + DEBUG_JTAG_IO("0x%02x", command); - + usb_out_buffer[0] = command; result = jlink_usb_write(jlink_jtag_handle, 1); - + if (result != 1) { LOG_ERROR("J-Link command 0x%02x failed (%d)", command, result); @@ -483,10 +483,10 @@ void jlink_simple_command(u8 command) int jlink_get_status(void) { int result; - + jlink_simple_command(EMU_CMD_GET_STATE); result = jlink_usb_read(jlink_jtag_handle); - + if (result == 8) { int vref = usb_in_buffer[0] + (usb_in_buffer[1] << 8); @@ -494,7 +494,7 @@ int jlink_get_status(void) vref / 1000, vref % 1000, \ usb_in_buffer[2], usb_in_buffer[3], usb_in_buffer[4], \ usb_in_buffer[5], usb_in_buffer[6], usb_in_buffer[7]); - + if (vref < 1500) { LOG_ERROR("Vref too low. Check Target Power\n"); @@ -504,7 +504,7 @@ int jlink_get_status(void) { LOG_ERROR("J-Link command EMU_CMD_GET_STATE failed (%d)\n", result); } - + return ERROR_OK; } @@ -512,16 +512,16 @@ int jlink_get_version_info(void) { int result; int len = 0; - + /* query hardware version */ jlink_simple_command(EMU_CMD_VERSION); result = jlink_usb_read(jlink_jtag_handle); - + if (result == 2) { len = buf_get_u32(usb_in_buffer, 0, 16); result = jlink_usb_read(jlink_jtag_handle); - + if (result == len) { usb_in_buffer[result] = 0; @@ -529,7 +529,7 @@ int jlink_get_version_info(void) return ERROR_OK; } } - + LOG_ERROR("J-Link command EMU_CMD_VERSION failed (%d)\n", result); return ERROR_JTAG_DEVICE_ERROR; } @@ -541,7 +541,7 @@ int jlink_handle_jlink_info_command(struct command_context_s *cmd_ctx, char *cmd /* attempt to get status */ jlink_get_status(); } - + return ERROR_OK; } @@ -581,7 +581,7 @@ void jlink_tap_ensure_space(int scans, int bits) { int available_scans = MAX_PENDING_SCAN_RESULTS - pending_scan_results_length; int available_bits = JLINK_TAP_BUFFER_SIZE * 8 - tap_length; - + if (scans > available_scans || bits > available_bits) { jlink_tap_execute(); @@ -592,12 +592,12 @@ void jlink_tap_append_step(int tms, int tdi) { last_tms = tms; int index = tap_length / 8; - + if (index < JLINK_TAP_BUFFER_SIZE) { int bit_index = tap_length % 8; u8 bit = 1 << bit_index; - + if (tms) { tms_buffer[index] |= bit; @@ -606,7 +606,7 @@ void jlink_tap_append_step(int tms, int tdi) { tms_buffer[index] &= ~bit; } - + if (tdi) { tdi_buffer[index] |= bit; @@ -615,7 +615,7 @@ void jlink_tap_append_step(int tms, int tdi) { tdi_buffer[index] &= ~bit; } - + tap_length++; } else @@ -628,12 +628,12 @@ void jlink_tap_append_scan(int length, u8 *buffer, scan_command_t *command) { pending_scan_result_t *pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length]; int i; - + pending_scan_result->first = tap_length; pending_scan_result->length = length; pending_scan_result->command = command; pending_scan_result->buffer = buffer; - + for (i = 0; i < length; i++) { jlink_tap_append_step((i < length-1 ? 0 : 1), (buffer[i/8] >> (i%8)) & 1); @@ -650,7 +650,7 @@ int jlink_tap_execute(void) int tdi_offset; int i; int result; - + if (tap_length > 0) { /* Pad last byte so that tap_length is divisible by 8 */ @@ -660,35 +660,35 @@ int jlink_tap_execute(void) * analogous to free-running JTAG interfaces. */ jlink_tap_append_step(last_tms, 0); } - + byte_length = tap_length / 8; - + usb_out_buffer[0] = EMU_CMD_HW_JTAG3; usb_out_buffer[1] = 0; usb_out_buffer[2] = (tap_length >> 0) & 0xff; usb_out_buffer[3] = (tap_length >> 8) & 0xff; - + tms_offset = 4; for (i = 0; i < byte_length; i++) { usb_out_buffer[tms_offset + i] = tms_buffer[i]; } - + tdi_offset = tms_offset + byte_length; for (i = 0; i < byte_length; i++) { usb_out_buffer[tdi_offset + i] = tdi_buffer[i]; } - + result = jlink_usb_message(jlink_jtag_handle, 4 + 2 * byte_length, byte_length); - + if (result == byte_length) { for (i = 0; i < byte_length; i++) { tdo_buffer[i] = usb_in_buffer[i]; } - + for (i = 0; i < pending_scan_results_length; i++) { pending_scan_result_t *pending_scan_result = &pending_scan_results_buffer[i]; @@ -696,22 +696,22 @@ int jlink_tap_execute(void) int length = pending_scan_result->length; int first = pending_scan_result->first; scan_command_t *command = pending_scan_result->command; - + /* Copy to buffer */ buf_set_buf(tdo_buffer, first, buffer, 0, length); - + DEBUG_JTAG_IO("pending scan result, length = %d", length); - + #ifdef _DEBUG_USB_COMMS_ jlink_debug_buffer(buffer, byte_length); #endif - + if (jtag_read_buffer(buffer, command) != ERROR_OK) { jlink_tap_init(); return ERROR_JTAG_QUEUE_FAILED; } - + if (pending_scan_result->buffer != NULL) { free(pending_scan_result->buffer); @@ -723,10 +723,10 @@ int jlink_tap_execute(void) LOG_ERROR("jlink_tap_execute, wrong result %d, expected %d", result, byte_length); return ERROR_JTAG_QUEUE_FAILED; } - + jlink_tap_init(); } - + return ERROR_OK; } @@ -738,19 +738,19 @@ jlink_jtag_t* jlink_usb_open() struct usb_bus *busses; struct usb_bus *bus; struct usb_device *dev; - + jlink_jtag_t *result; - + result = (jlink_jtag_t*) malloc(sizeof(jlink_jtag_t)); - + usb_init(); usb_find_busses(); usb_find_devices(); - + busses = usb_get_busses(); - + /* find jlink_jtag device in usb bus */ - + for (bus = busses; bus; bus = bus->next) { for (dev = bus->devices; dev; dev = dev->next) @@ -758,23 +758,23 @@ jlink_jtag_t* jlink_usb_open() if ((dev->descriptor.idVendor == VID) && (dev->descriptor.idProduct == PID)) { result->usb_handle = usb_open(dev); - + /* usb_set_configuration required under win32 */ usb_set_configuration(result->usb_handle, dev->config[0].bConfigurationValue); usb_claim_interface(result->usb_handle, 0); - + #if 0 - /* + /* * This makes problems under Mac OS X. And is not needed * under Windows. Hopefully this will not break a linux build */ usb_set_altinterface(result->usb_handle, 0); -#endif +#endif return result; } } } - + free(result); return NULL; } @@ -790,7 +790,7 @@ int jlink_usb_message(jlink_jtag_t *jlink_jtag, int out_length, int in_length) { int result; int result2; - + result = jlink_usb_write(jlink_jtag, out_length); if (result == out_length) { @@ -811,7 +811,7 @@ int jlink_usb_message(jlink_jtag_t *jlink_jtag, int out_length, int in_length) else { LOG_ERROR("jlink_usb_read_emu_result (requested=0, result=%d)", usb_emu_result_buffer[0]); - return -1; + return -1; } } else @@ -830,7 +830,7 @@ int jlink_usb_message(jlink_jtag_t *jlink_jtag, int out_length, int in_length) else { LOG_ERROR("jlink_usb_read_emu_result (requested=0, result=%d)", usb_in_buffer[result]); - return -1; + return -1; } } } @@ -851,18 +851,18 @@ int jlink_usb_message(jlink_jtag_t *jlink_jtag, int out_length, int in_length) int jlink_usb_write(jlink_jtag_t *jlink_jtag, int out_length) { int result; - + if (out_length > JLINK_OUT_BUFFER_SIZE) { LOG_ERROR("jlink_jtag_write illegal out_length=%d (max=%d)", out_length, JLINK_OUT_BUFFER_SIZE); return -1; } - + result = usb_bulk_write(jlink_jtag->usb_handle, JLINK_WRITE_ENDPOINT, \ usb_out_buffer, out_length, JLINK_USB_TIMEOUT); - + DEBUG_JTAG_IO("jlink_usb_write, out_length = %d, result = %d", out_length, result); - + #ifdef _DEBUG_USB_COMMS_ jlink_debug_buffer(usb_out_buffer, out_length); #endif @@ -876,7 +876,7 @@ int jlink_usb_read(jlink_jtag_t *jlink_jtag) usb_in_buffer, JLINK_IN_BUFFER_SIZE, JLINK_USB_TIMEOUT); DEBUG_JTAG_IO("jlink_usb_read, result = %d", result); - + #ifdef _DEBUG_USB_COMMS_ jlink_debug_buffer(usb_in_buffer, result); #endif @@ -890,7 +890,7 @@ int jlink_usb_read_emu_result(jlink_jtag_t *jlink_jtag) usb_emu_result_buffer, JLINK_EMU_RESULT_BUFFER_SIZE, JLINK_USB_TIMEOUT); DEBUG_JTAG_IO("jlink_usb_read_result, result = %d", result); - + #ifdef _DEBUG_USB_COMMS_ jlink_debug_buffer(usb_emu_result_buffer, result); #endif @@ -906,7 +906,7 @@ void jlink_debug_buffer(u8 *buffer, int length) char s[4]; int i; int j; - + for (i = 0; i < length; i += BYTES_PER_LINE) { snprintf(line, 5, "%04x", i); diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index 555d1409..d4864183 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -87,22 +87,22 @@ int tap_move_map[16] = { tap_transition_t tap_transitions[16] = { - {TAP_TLR, TAP_RTI}, /* TLR */ - {TAP_SIS, TAP_CD}, /* SDS */ - {TAP_E1D, TAP_SD}, /* CD */ - {TAP_E1D, TAP_SD}, /* SD */ - {TAP_UD, TAP_PD}, /* E1D */ - {TAP_E2D, TAP_PD}, /* PD */ - {TAP_UD, TAP_SD}, /* E2D */ - {TAP_SDS, TAP_RTI}, /* UD */ - {TAP_SDS, TAP_RTI}, /* RTI */ - {TAP_TLR, TAP_CI}, /* SIS */ - {TAP_E1I, TAP_SI}, /* CI */ - {TAP_E1I, TAP_SI}, /* SI */ - {TAP_UI, TAP_PI}, /* E1I */ - {TAP_E2I, TAP_PI}, /* PI */ - {TAP_UI, TAP_SI}, /* E2I */ - {TAP_SDS, TAP_RTI} /* UI */ + {TAP_RESET, TAP_IDLE}, /* TLR */ + {TAP_IRSELECT, TAP_DRCAPTURE}, /* SDS */ + {TAP_DREXIT1, TAP_DRSHIFT}, /* CD */ + {TAP_DREXIT1, TAP_DRSHIFT}, /* SD */ + {TAP_DRUPDATE, TAP_DRPAUSE}, /* E1D */ + {TAP_DREXIT2, TAP_DRPAUSE}, /* PD */ + {TAP_DRUPDATE, TAP_DRSHIFT}, /* E2D */ + {TAP_DRSELECT, TAP_IDLE}, /* UD */ + {TAP_DRSELECT, TAP_IDLE}, /* RTI */ + {TAP_RESET, TAP_IRCAPTURE}, /* SIS */ + {TAP_IREXIT1, TAP_IRSHIFT}, /* CI */ + {TAP_IREXIT1, TAP_IRSHIFT}, /* SI */ + {TAP_IRUPDATE, TAP_IRPAUSE}, /* E1I */ + {TAP_IREXIT2, TAP_IRPAUSE}, /* PI */ + {TAP_IRUPDATE, TAP_IRSHIFT}, /* E2I */ + {TAP_DRSELECT, TAP_IDLE} /* UI */ }; char* jtag_event_strings[] = @@ -115,8 +115,8 @@ char* jtag_event_strings[] = * inside the drivers, but we don't want to break * linking the drivers!!!! */ -enum tap_state end_state = TAP_TLR; -enum tap_state cur_state = TAP_TLR; +enum tap_state end_state = TAP_RESET; +enum tap_state cur_state = TAP_RESET; int jtag_trst = 0; int jtag_srst = 0; @@ -125,8 +125,8 @@ jtag_command_t **last_comand_pointer = &jtag_command_queue; static jtag_tap_t *jtag_all_taps = NULL; enum reset_types jtag_reset_config = RESET_NONE; -enum tap_state cmd_queue_end_state = TAP_TLR; -enum tap_state cmd_queue_cur_state = TAP_TLR; +enum tap_state cmd_queue_end_state = TAP_RESET; +enum tap_state cmd_queue_cur_state = TAP_RESET; int jtag_verify_capture_ir = 1; @@ -477,7 +477,7 @@ void* cmd_queue_alloc(size_t size) * alignment. * * What I do not/have is a reasonable portable means - * to align by... + * to align by... * * The solution here, is based on these suggestions. * http://gcc.gnu.org/ml/gcc-help/2008-12/msg00041.html @@ -493,8 +493,8 @@ void* cmd_queue_alloc(size_t size) // The alignment process. size = (size + ALIGN_SIZE -1) & (~(ALIGN_SIZE-1)); - // Done... - + // Done... + if (*p_page) { @@ -543,7 +543,7 @@ static void jtag_prelude1(void) return; } - if (cmd_queue_end_state == TAP_TLR) + if (cmd_queue_end_state == TAP_RESET) jtag_call_event_callbacks(JTAG_TRST_ASSERTED); } @@ -959,7 +959,7 @@ int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int num_fields, scan_field_t *f void jtag_add_tlr(void) { - jtag_prelude(TAP_TLR); + jtag_prelude(TAP_RESET); int retval; retval=interface_jtag_add_tlr(); @@ -969,7 +969,7 @@ void jtag_add_tlr(void) int MINIDRIVER(interface_jtag_add_tlr)() { - enum tap_state state = TAP_TLR; + enum tap_state state = TAP_RESET; jtag_command_t **last_cmd = jtag_get_last_command_p(); /* allocate memory for a new list member */ @@ -1000,9 +1000,9 @@ void jtag_add_pathmove(int num_states, enum tap_state *path) for (i=0; iexpected_ids_cnt) { LOG_ERROR("JTAG tap: %s got: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)", @@ -1662,7 +1662,7 @@ int jtag_validate_chain(void) field.in_handler = NULL; field.in_handler_priv = NULL; - jtag_add_plain_ir_scan(1, &field, TAP_TLR); + jtag_add_plain_ir_scan(1, &field, TAP_RESET); jtag_execute_queue(); tap = NULL; @@ -1801,8 +1801,8 @@ jim_newtap_cmd( Jim_GetOptInfo *goi ) memcpy(new_expected_ids, pTap->expected_ids, sizeof(u32) * pTap->expected_ids_cnt); new_expected_ids[pTap->expected_ids_cnt] = w; - - free(pTap->expected_ids); + + free(pTap->expected_ids); pTap->expected_ids = new_expected_ids; pTap->expected_ids_cnt++; break; diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 5e1733e9..d58be2f7 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -33,20 +33,15 @@ #define _DEBUG_JTAG_IO_ #endif -/* Tap States - * TLR - Test-Logic-Reset, RTI - Run-Test/Idle, - * SDS - Select-DR-Scan, CD - Capture-DR, SD - Shift-DR, E1D - Exit1-DR, - * PD - Pause-DR, E2D - Exit2-DR, UD - Update-DR, - * SIS - Select-IR-Scan, CI - Capture-IR, SI - Shift-IR, E1I - Exit1-IR, - * PI - Pause-IR, E2I - Exit2-IR, UI - Update-IR +/* 16 Tap States, from page 21 of ASSET InterTech, Inc.'s svf.pdf */ enum tap_state { - TAP_TLR = 0x0, TAP_RTI = 0x8, - TAP_SDS = 0x1, TAP_CD = 0x2, TAP_SD = 0x3, TAP_E1D = 0x4, - TAP_PD = 0x5, TAP_E2D = 0x6, TAP_UD = 0x7, - TAP_SIS = 0x9, TAP_CI = 0xa, TAP_SI = 0xb, TAP_E1I = 0xc, - TAP_PI = 0xd, TAP_E2I = 0xe, TAP_UI = 0xf + TAP_RESET = 0x0, TAP_IDLE = 0x8, + TAP_DRSELECT = 0x1, TAP_DRCAPTURE = 0x2, TAP_DRSHIFT = 0x3, TAP_DREXIT1 = 0x4, + TAP_DRPAUSE = 0x5, TAP_DREXIT2 = 0x6, TAP_DRUPDATE = 0x7, + TAP_IRSELECT = 0x9, TAP_IRCAPTURE = 0xa, TAP_IRSHIFT = 0xb, TAP_IREXIT1 = 0xc, + TAP_IRPAUSE = 0xd, TAP_IREXIT2 = 0xe, TAP_IRUPDATE = 0xf }; typedef struct tap_transition_s @@ -325,7 +320,7 @@ extern int jtag_register_commands(struct command_context_s *cmd_ctx); /* JTAG interface, can be implemented with a software or hardware fifo * - * TAP_SD and TAP_SI are illegal end states. TAP_SD/SI as end states + * TAP_DRSHIFT and TAP_IRSHIFT are illegal end states. TAP_DRSHIFT/SI as end states * can be emulated by using a larger scan. * * Code that is relatively insensitive to the path(as long @@ -343,7 +338,7 @@ extern void jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum ta extern int interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum tap_state endstate); extern void 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); -/* run a TAP_TLR reset. End state is TAP_TLR, regardless +/* run a TAP_RESET reset. End state is TAP_RESET, regardless * of start state. */ extern void jtag_add_tlr(void); @@ -364,7 +359,7 @@ extern int interface_jtag_add_tlr(void); * 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! + * Note! TAP_RESET must not be used in the path! * * Note that the first on the list must be reachable * via a single transition from the current state. @@ -380,12 +375,12 @@ extern int interface_jtag_add_tlr(void); */ extern void jtag_add_pathmove(int num_states, enum tap_state *path); extern int interface_jtag_add_pathmove(int num_states, enum tap_state *path); -/* go to TAP_RTI, if we're not already there and cycle - * precisely num_cycles in the TAP_RTI after which move - * to the end state, if it is != TAP_RTI +/* go to TAP_IDLE, if we're not already there and cycle + * precisely num_cycles in the TAP_IDLE after which move + * to the end state, if it is != TAP_IDLE * * nb! num_cycles can be 0, in which case the fn will navigate - * to endstate via TAP_RTI + * to endstate via TAP_IDLE */ extern void jtag_add_runtest(int num_cycles, enum tap_state endstate); extern int interface_jtag_add_runtest(int num_cycles, enum tap_state endstate); @@ -488,7 +483,7 @@ extern int jtag_verify_capture_ir; #define MINIDRIVER(a) a /* jtag_add_dr_out() is a faster version of jtag_add_dr_scan() * - * Current or end_state can not be TAP_TLR. end_state can be -1 + * Current or end_state can not be TAP_RESET. end_state can be -1 * * num_bits[i] is the number of bits to clock out from value[i] LSB first. * diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c index c0fae956..ae365719 100644 --- a/src/jtag/usbprog.c +++ b/src/jtag/usbprog.c @@ -151,7 +151,7 @@ int usbprog_execute_queue(void) #endif if (cmd->cmd.reset->trst == 1) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; } usbprog_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; @@ -299,9 +299,9 @@ void usbprog_runtest(int num_cycles) int i; /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_RTI) + if (cur_state != TAP_IDLE) { - usbprog_end_state(TAP_RTI); + usbprog_end_state(TAP_IDLE); usbprog_state_move(); } @@ -336,9 +336,9 @@ void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) enum tap_state saved_end_state = end_state; if (ir_scan) - usbprog_end_state(TAP_SI); + usbprog_end_state(TAP_IRSHIFT); else - usbprog_end_state(TAP_SD); + usbprog_end_state(TAP_DRSHIFT); /* usbprog_jtag_tms_send(usbprog_jtag_handle); */ @@ -361,9 +361,9 @@ void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) } if (ir_scan) - cur_state = TAP_PI; + cur_state = TAP_IRPAUSE; else - cur_state = TAP_PD; + cur_state = TAP_DRPAUSE; if (cur_state != end_state) usbprog_state_move(); diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c index 1ff5efff..3c24a630 100644 --- a/src/jtag/zy1000.c +++ b/src/jtag/zy1000.c @@ -158,7 +158,7 @@ void zy1000_reset(int trst, int srst) else { /* Danger!!! if clk!=0 when in - * idle in TAP_RTI, reset halt on str912 will fail. + * idle in TAP_IDLE, reset halt on str912 will fail. */ ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001); } @@ -177,7 +177,7 @@ void zy1000_reset(int trst, int srst) { waitIdle(); /* we're now in the TLR state until trst is deasserted */ - ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_TLR); + ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_RESET); } else { /* We'll get RCLK failure when we assert TRST, so clear any false positives here */ @@ -303,7 +303,7 @@ int loadFile(const char *fileName, void **data, int *len) if (fread(*data, 1, *len, pFile)!=*len) { fclose(pFile); - free(*data); + free(*data); LOG_ERROR("Can't open %s\n", fileName); return ERROR_JTAG_DEVICE_ERROR; } @@ -429,7 +429,7 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, enum tap_s enum tap_state pause_state; int l; k=num_bits-j; - pause_state=(shiftState==TAP_SD)?TAP_SD:TAP_SI; + pause_state=(shiftState==TAP_DRSHIFT)?TAP_DRSHIFT:TAP_IRSHIFT; if (k>32) { k=32; @@ -437,7 +437,7 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, enum tap_s } else if (pause&&(i == num_fields-1)) { /* this was the last to shift out this time */ - pause_state=(shiftState==TAP_SD)?TAP_PD:TAP_PI; + pause_state=(shiftState==TAP_DRSHIFT)?TAP_DRPAUSE:TAP_IRPAUSE; } // we have (num_bits+7)/8 bytes of bits to toggle out. @@ -520,7 +520,7 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_st fields[j].in_check_mask = tap->expected_mask; } - scanFields(1, fields+j, TAP_SI, pause); + scanFields(1, fields+j, TAP_IRSHIFT, pause); /* update device information */ buf_cpy(fields[j].out_value, tap->cur_instr, scan_size); @@ -538,7 +538,7 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_st memset(&tmp, 0, sizeof(tmp)); tmp.out_value = ones; tmp.num_bits = scan_size; - scanFields(1, &tmp, TAP_SI, pause); + scanFields(1, &tmp, TAP_IRSHIFT, pause); /* update device information */ buf_cpy(tmp.out_value, tap->cur_instr, scan_size); tap->bypass = 1; @@ -555,7 +555,7 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_st int interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum tap_state state) { - scanFields(num_fields, fields, TAP_SI, 1); + scanFields(num_fields, fields, TAP_IRSHIFT, 1); gotoEndState(); return ERROR_OK; @@ -580,7 +580,7 @@ int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_st { found = 1; - scanFields(1, fields+j, TAP_SD, pause); + scanFields(1, fields+j, TAP_DRSHIFT, pause); } } if (!found) @@ -596,7 +596,7 @@ int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_st tmp.in_handler = NULL; tmp.in_handler_priv = NULL; - scanFields(1, &tmp, TAP_SD, pause); + scanFields(1, &tmp, TAP_DRSHIFT, pause); } else { @@ -608,7 +608,7 @@ int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_st int interface_jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum tap_state state) { - scanFields(num_fields, fields, TAP_SD, 1); + scanFields(num_fields, fields, TAP_DRSHIFT, 1); gotoEndState(); return ERROR_OK; } @@ -616,7 +616,7 @@ int interface_jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum int interface_jtag_add_tlr() { - setCurrentState(TAP_TLR); + setCurrentState(TAP_RESET); return ERROR_OK; } @@ -635,7 +635,7 @@ int interface_jtag_add_reset(int req_trst, int req_srst) int interface_jtag_add_runtest(int num_cycles, enum tap_state state) { /* num_cycles can be 0 */ - setCurrentState(TAP_RTI); + setCurrentState(TAP_IDLE); /* execute num_cycles, 32 at the time. */ int i; @@ -647,14 +647,14 @@ int interface_jtag_add_runtest(int num_cycles, enum tap_state state) { num=num_cycles-i; } - shiftValueInner(TAP_RTI, TAP_RTI, num, 0); + shiftValueInner(TAP_IDLE, TAP_IDLE, num, 0); } #if !TEST_MANUAL() /* finish in end_state */ setCurrentState(state); #else - enum tap_state t=TAP_RTI; + enum tap_state t=TAP_IDLE; /* test manual drive code on any target */ int tms; u8 tms_scan = TAP_MOVE(t, state); @@ -734,8 +734,8 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little int i; for (i = 0; i < count; i++) { - shiftValueInner(TAP_SD, TAP_SD, 32, fast_target_buffer_get_u32(buffer, 1)); - shiftValueInner(TAP_SD, end_state, 6, reg_addr|(1<<5)); + shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 1)); + shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5)); buffer+=4; } } else @@ -743,8 +743,8 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little int i; for (i = 0; i < count; i++) { - shiftValueInner(TAP_SD, TAP_SD, 32, fast_target_buffer_get_u32(buffer, 0)); - shiftValueInner(TAP_SD, end_state, 6, reg_addr|(1<<5)); + shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 0)); + shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5)); buffer+=4; } } -- cgit v1.2.3