X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fgw16012.c;h=63dcd627f3d4a1517e6461e33939a490e543f129;hp=8c7dc81b97f4be0fb10eb70fcaee712838a10e00;hb=f90d8fa45f2d4c9d4b7990f198b232ee55cbb4e1;hpb=2585fc34200938fb3fa55a450ea37f68012aafa7 diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c index 8c7dc81b97..63dcd627f3 100644 --- a/src/jtag/gw16012.c +++ b/src/jtag/gw16012.c @@ -21,9 +21,9 @@ #include "config.h" #endif -#include "replacements.h" +#include "interface.h" +#include "commands.h" -#include "jtag.h" #if 1 #define _DEBUG_GW16012_IO_ @@ -33,7 +33,6 @@ /* -ino: 060521-1036 */ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -#include #include #include #define ioperm(startport,length,enable)\ @@ -41,14 +40,8 @@ #else -#ifdef _WIN32 -#include "errno.h" -#endif /* _WIN32 */ - #endif /* __FreeBSD__, __FreeBSD_kernel__ */ -#include -#include #if PARPORT_USE_PPDEV == 1 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) @@ -68,56 +61,52 @@ #endif #endif -#if PARPORT_USE_GIVEIO == 1 -#if IS_CYGWIN == 1 +#if PARPORT_USE_GIVEIO == 1 && IS_CYGWIN == 1 #include -#include -#endif #endif -#include "log.h" /* configuration */ -u16 gw16012_port; +uint16_t gw16012_port; /* interface variables */ -static u8 gw16012_msb = 0x0; -static u8 gw16012_control_value = 0x0; +static uint8_t gw16012_msb = 0x0; +static uint8_t gw16012_control_value = 0x0; #if PARPORT_USE_PPDEV == 1 static int device_handle; #endif -int gw16012_execute_queue(void); -int gw16012_register_commands(struct command_context_s *cmd_ctx); -int gw16012_speed(int speed); -int gw16012_init(void); -int gw16012_quit(void); +static int gw16012_execute_queue(void); +static int gw16012_register_commands(struct command_context_s *cmd_ctx); +static int gw16012_speed(int speed); +static int gw16012_init(void); +static int gw16012_quit(void); -int gw16012_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static 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, }; -int gw16012_register_commands(struct command_context_s *cmd_ctx) +static 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; } -void gw16012_data(u8 value) +static void gw16012_data(uint8_t value) { value = (value & 0x7f) | gw16012_msb; gw16012_msb ^= 0x80; /* toggle MSB */ @@ -125,7 +114,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,10 +123,10 @@ void gw16012_data(u8 value) #else outb(value, gw16012_port); #endif - #endif + #endif } -void gw16012_control(u8 value) +static void gw16012_control(uint8_t value) { if (value != gw16012_control_value) { @@ -159,7 +148,7 @@ void gw16012_control(u8 value) } } -void gw16012_input(u8 *value) +static void gw16012_input(uint8_t *value) { #if PARPORT_USE_PPDEV == 1 ioctl(device_handle, PPRSTATUS, value); @@ -173,7 +162,7 @@ void gw16012_input(u8 *value) } /* (1) assert or (0) deassert reset lines */ -void gw16012_reset(int trst, int srst) +static void gw16012_reset(int trst, int srst) { LOG_DEBUG("trst: %i, srst: %i", trst, srst); @@ -188,16 +177,16 @@ void gw16012_reset(int trst, int srst) gw16012_control(0x0b); } -int gw16012_speed(int speed) +static int gw16012_speed(int speed) { return ERROR_OK; } -void gw16012_end_state(state) +static void gw16012_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); @@ -205,23 +194,24 @@ void gw16012_end_state(state) } } -void gw16012_state_move(void) +static void gw16012_state_move(void) { - int i=0, tms=0; - u8 tms_scan = TAP_MOVE(cur_state, end_state); - + int i = 0, tms = 0; + uint8_t tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state()); + int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state()); + gw16012_control(0x0); /* single-bit mode */ - - for (i = 0; i < 7; i++) + + for (i = 0; i < tms_count; i++) { tms = (tms_scan >> i) & 1; gw16012_data(tms << 1); /* output next TMS bit */ } - - cur_state = end_state; + + tap_set_state(tap_get_end_state()); } -void gw16012_path_move(pathmove_command_t *cmd) +static void gw16012_path_move(pathmove_command_t *cmd) { int num_states = cmd->num_states; int state_count; @@ -230,65 +220,65 @@ void gw16012_path_move(pathmove_command_t *cmd) while (num_states) { gw16012_control(0x0); /* single-bit mode */ - if (tap_transitions[cur_state].low == cmd->path[state_count]) + if (tap_state_transition(tap_get_state(), false) == cmd->path[state_count]) { gw16012_data(0x0); /* TCK cycle with TMS low */ } - else if (tap_transitions[cur_state].high == cmd->path[state_count]) + else if (tap_state_transition(tap_get_state(), true) == cmd->path[state_count]) { gw16012_data(0x2); /* TCK cycle with TMS high */ } else { - LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[state_count]]); + LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(tap_get_state()), tap_state_name(cmd->path[state_count])); exit(-1); } - - cur_state = cmd->path[state_count]; + + tap_set_state(cmd->path[state_count]); state_count++; num_states--; } - - end_state = cur_state; + + tap_set_end_state(tap_get_state()); } -void gw16012_runtest(int num_cycles) +static void gw16012_runtest(int num_cycles) { - enum tap_state saved_end_state = end_state; + tap_state_t saved_end_state = tap_get_end_state(); int i; - - /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_RTI) + + /* only do a state_move when we're not already in IDLE */ + if (tap_get_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) + if (tap_get_state() != tap_get_end_state()) gw16012_state_move(); } -void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) +static void gw16012_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 scan_out, scan_in; + tap_state_t saved_end_state = tap_get_end_state(); + uint8_t 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 && (tap_get_state() == TAP_DRSHIFT)) || (ir_scan && (tap_get_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 +292,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; - + uint8_t 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 && (tap_get_end_state() == TAP_IRSHIFT)) + || (!ir_scan && (tap_get_end_state() == TAP_DRSHIFT))) { - tms = 0; + tms = 0; } else { @@ -329,56 +319,49 @@ 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 && (tap_get_end_state() == TAP_IRSHIFT)) || + (!ir_scan && (tap_get_end_state() == TAP_DRSHIFT)))) { gw16012_data(0x0); if (ir_scan) - cur_state = TAP_PI; + tap_set_state(TAP_IRPAUSE); else - cur_state = TAP_PD; - - if (cur_state != end_state) + tap_set_state(TAP_DRPAUSE); + + if (tap_get_state() != tap_get_end_state()) gw16012_state_move(); } } -int gw16012_execute_queue(void) +static int gw16012_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 * that wasn't handled by a caller-provided error handler - */ + */ retval = ERROR_OK; - + while (cmd) { switch (cmd->type) { - case JTAG_END_STATE: -#ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("end_state: %i", cmd->cmd.end_state->end_state); -#endif - if (cmd->cmd.end_state->end_state != -1) - gw16012_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_TLR; + tap_set_state(TAP_RESET); } gw16012_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; @@ -386,16 +369,14 @@ int gw16012_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) - gw16012_end_state(cmd->cmd.runtest->end_state); + gw16012_end_state(cmd->cmd.runtest->end_state); gw16012_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) - gw16012_end_state(cmd->cmd.statemove->end_state); + gw16012_end_state(cmd->cmd.statemove->end_state); gw16012_state_move(); break; case JTAG_PATHMOVE: @@ -405,12 +386,11 @@ int gw16012_execute_queue(void) gw16012_path_move(cmd->cmd.pathmove); break; case JTAG_SCAN: - if (cmd->cmd.scan->end_state != -1) - gw16012_end_state(cmd->cmd.scan->end_state); + gw16012_end_state(cmd->cmd.scan->end_state); 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,102 +411,120 @@ int gw16012_execute_queue(void) } cmd = cmd->next; } - + return retval; } #if PARPORT_USE_GIVEIO == 1 -int gw16012_get_giveio_access() +static int gw16012_get_giveio_access(void) { - HANDLE h; - OSVERSIONINFO version; - - version.dwOSVersionInfoSize = sizeof 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 ); - if (h == INVALID_HANDLE_VALUE) { - errno = ENODEV; - return -1; - } - - CloseHandle( h ); - - return 0; + HANDLE h; + OSVERSIONINFO version; + + version.dwOSVersionInfoSize = sizeof 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 ); + if (h == INVALID_HANDLE_VALUE) { + errno = ENODEV; + return -1; + } + + CloseHandle(h ); + + return 0; } #endif -int gw16012_init(void) -{ #if PARPORT_USE_PPDEV == 1 - char buffer[256]; - int i = 0; -#endif - u8 status_port; - -#if PARPORT_USE_PPDEV == 1 - if (device_handle>0) - { - LOG_ERROR("device is already opened"); - return ERROR_JTAG_INIT_FAILED; - } #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - LOG_DEBUG("opening /dev/ppi%d...", gw16012_port); - snprintf(buffer, 256, "/dev/ppi%d", gw16012_port); - device_handle = open(buffer, O_WRONLY); -#else - LOG_DEBUG("opening /dev/parport%d...", gw16012_port); +#define GW16012_PPDEV_NAME "ppi" - snprintf(buffer, 256, "/dev/parport%d", gw16012_port); - device_handle = open(buffer, O_WRONLY); -#endif - if (device_handle<0) +static int gw16012_init_ioctls(void) +{ + int temp = 0; + temp = ioctl(device_handle, PPCLAIM); + if (temp < 0) { - LOG_ERROR("cannot open device. check it exists and that user read and write rights are set"); + LOG_ERROR("cannot claim device"); return ERROR_JTAG_INIT_FAILED; } - LOG_DEBUG("...open"); + temp = PARPORT_MODE_COMPAT; + temp = ioctl(device_handle, PPSETMODE, &temp); + if (temp < 0) + { + LOG_ERROR(" cannot set compatible mode to device"); + return ERROR_JTAG_INIT_FAILED; + } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - i=ioctl(device_handle, PPCLAIM); - if (i<0) + temp = IEEE1284_MODE_COMPAT; + temp = ioctl(device_handle, PPNEGOT, &temp); + if (temp < 0) { - LOG_ERROR("cannot claim device"); + LOG_ERROR("cannot set compatible 1284 mode to device"); return ERROR_JTAG_INIT_FAILED; } + return ERROR_OK; +} +#else + +#define GW16012_PPDEV_NAME "parport" + +static int gw16012_init_ioctls(void) +{ + return ERROR_OK; +} + +#endif // defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + +static int gw16012_init_device(void) +{ + const char *device_name = GW16012_PPDEV_NAME; + char buffer[256]; - i = PARPORT_MODE_COMPAT; - i= ioctl(device_handle, PPSETMODE, & i); - if (i<0) + if (device_handle > 0) { - LOG_ERROR(" cannot set compatible mode to device"); + LOG_ERROR("device is already opened"); return ERROR_JTAG_INIT_FAILED; } - i = IEEE1284_MODE_COMPAT; - i = ioctl(device_handle, PPNEGOT, & i); - if (i<0) + snprintf(buffer, 256, "/dev/%s%d", device_name, gw16012_port); + LOG_DEBUG("opening %s...", buffer); + + device_handle = open(buffer, O_WRONLY); + if (device_handle < 0) { - LOG_ERROR("cannot set compatible 1284 mode to device"); + LOG_ERROR("cannot open device. check it exists and that user read and write rights are set"); return ERROR_JTAG_INIT_FAILED; } -#endif -#else + + LOG_DEBUG("...open"); + + if (gw16012_init_ioctls() != ERROR_OK) + return ERROR_JTAG_INIT_FAILED; + + return ERROR_OK; +} + +#else // PARPORT_USE_PPDEV + +static int gw16012_init_device(void) +{ if (gw16012_port == 0) { gw16012_port = 0x378; LOG_WARNING("No gw16012 port specified, using default '0x378' (LPT1)"); } - - LOG_DEBUG("requesting privileges for parallel port 0x%lx...", gw16012_port); + + LOG_DEBUG("requesting privileges for parallel port 0x%lx...", (long unsigned)(gw16012_port) ); #if PARPORT_USE_GIVEIO == 1 if (gw16012_get_giveio_access() != 0) #else /* PARPORT_USE_GIVEIO */ @@ -544,31 +542,52 @@ int gw16012_init(void) #else outb(0x0, gw16012_port + 2); #endif -#endif /* PARPORT_USE_PPDEV */ - + return ERROR_OK; +} + +#endif // PARPORT_USE_PPDEV + +static int gw16012_init(void) +{ + uint8_t status_port; + + if (gw16012_init_device() != ERROR_OK) + return ERROR_JTAG_INIT_FAILED; + gw16012_input(&status_port); gw16012_msb = (status_port & 0x80) ^ 0x80; - - gw16012_speed(jtag_speed); + + gw16012_speed(jtag_get_speed()); gw16012_reset(0, 0); - + return ERROR_OK; } -int gw16012_quit(void) +static int gw16012_quit(void) { - + return ERROR_OK; } -int gw16012_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int gw16012_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 (gw16012_port == 0) + { + int retval = parse_u16(args[0], &gw16012_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 (gw16012_port == 0) - gw16012_port = strtoul(args[0], NULL, 0); + command_print(cmd_ctx, "parport port = %u", gw16012_port); return ERROR_OK; }