X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fgw16012.c;h=07188f4e5cbd6ab26c91aa0c323e0d83f5775550;hp=dd306f962a7fb956ef5d9544495a5a03447d6cb5;hb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;hpb=de6d69cc60acae64b35f73be6753ff85545d8221 diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c index dd306f962a..07188f4e5c 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,24 @@ #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 -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); - -static int gw16012_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); - -jtag_interface_t gw16012_interface = -{ - .name = "gw16012", - - .execute_queue = gw16012_execute_queue, - - .speed = gw16012_speed, - .register_commands = gw16012_register_commands, - .init = gw16012_init, - .quit = gw16012_quit, -}; - -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; -} - -static void gw16012_data(u8 value) +static void gw16012_data(uint8_t value) { value = (value & 0x7f) | gw16012_msb; gw16012_msb ^= 0x80; /* toggle MSB */ @@ -137,7 +98,7 @@ static void gw16012_data(u8 value) #endif } -static void gw16012_control(u8 value) +static void gw16012_control(uint8_t value) { if (value != gw16012_control_value) { @@ -159,7 +120,7 @@ static void gw16012_control(u8 value) } } -static void gw16012_input(u8 *value) +static void gw16012_input(uint8_t *value) { #if PARPORT_USE_PPDEV == 1 ioctl(device_handle, PPRSTATUS, value); @@ -207,12 +168,13 @@ static void gw16012_end_state(tap_state_t state) static void gw16012_state_move(void) { - int i=0, tms=0; - u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_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 */ @@ -275,12 +237,12 @@ static void gw16012_runtest(int num_cycles) gw16012_state_move(); } -static 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; tap_state_t saved_end_state = tap_get_end_state(); - u8 scan_out, scan_in; + uint8_t scan_out, scan_in; /* only if we're not already in the correct Shift state */ if (!((!ir_scan && (tap_get_state() == TAP_DRSHIFT)) || (ir_scan && (tap_get_state() == TAP_IRSHIFT)))) @@ -306,7 +268,7 @@ static void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_ 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); @@ -353,7 +315,7 @@ 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 @@ -365,13 +327,6 @@ static int gw16012_execute_queue(void) { switch (cmd->type) { - case JTAG_END_STATE: -#ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("end_state: %i", cmd->cmd.end_state->end_state); -#endif - if (cmd->cmd.end_state->end_state != TAP_INVALID) - 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); @@ -386,16 +341,14 @@ static 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 != TAP_INVALID) - 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 != TAP_INVALID) - gw16012_end_state(cmd->cmd.statemove->end_state); + gw16012_end_state(cmd->cmd.statemove->end_state); gw16012_state_move(); break; case JTAG_PATHMOVE: @@ -405,8 +358,7 @@ static int gw16012_execute_queue(void) gw16012_path_move(cmd->cmd.pathmove); break; case JTAG_SCAN: - if (cmd->cmd.scan->end_state != TAP_INVALID) - 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_ @@ -442,20 +394,20 @@ static int gw16012_get_giveio_access(void) OSVERSIONINFO version; version.dwOSVersionInfoSize = sizeof version; - if (!GetVersionEx( &version )) { + if (!GetVersionEx(&version)) { errno = EINVAL; return -1; } if (version.dwPlatformId != VER_PLATFORM_WIN32_NT) return 0; - h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + h = CreateFile("\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { errno = ENODEV; return -1; } - CloseHandle( h ); + CloseHandle(h); return 0; } @@ -520,7 +472,7 @@ static int gw16012_init_device(void) LOG_DEBUG("opening %s...", buffer); device_handle = open(buffer, O_WRONLY); - if (device_handle<0) + if (device_handle < 0) { LOG_ERROR("cannot open device. check it exists and that user read and write rights are set"); return ERROR_JTAG_INIT_FAILED; @@ -544,7 +496,7 @@ static int gw16012_init_device(void) LOG_WARNING("No gw16012 port specified, using default '0x378' (LPT1)"); } - LOG_DEBUG("requesting privileges for parallel port 0x%lx...", (long unsigned)(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 */ @@ -569,7 +521,7 @@ static int gw16012_init_device(void) static int gw16012_init(void) { - u8 status_port; + uint8_t status_port; if (gw16012_init_device() != ERROR_OK) return ERROR_JTAG_INIT_FAILED; @@ -577,7 +529,7 @@ static int gw16012_init(void) 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; @@ -589,14 +541,41 @@ static int gw16012_quit(void) return ERROR_OK; } -static int gw16012_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(gw16012_handle_parport_port_command) { - if (argc == 0) - return ERROR_OK; + if (argc == 1) + { + /* only if the port wasn't overwritten by cmdline */ + if (gw16012_port == 0) + { + COMMAND_PARSE_NUMBER(u16, args[0], gw16012_port); + } + 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; +} + +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; } + +jtag_interface_t gw16012_interface = { + .name = "gw16012", + .register_commands = &gw16012_register_commands, + .init = &gw16012_init, + .quit = &gw16012_quit, + .speed = &gw16012_speed, + .execute_queue = &gw16012_execute_queue, + };