X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fparport.c;h=5e329d42f23403edd9d213dab78453dd4062846f;hp=51442304c959d725759b0d192bbb5e0346926a94;hb=84df52f9ea78e2d71bde648a16b69d80404c6421;hpb=a3e84343e202eb70ebce0ec1e8b15d7f9ce57f00 diff --git a/src/jtag/parport.c b/src/jtag/parport.c index 51442304c9..5e329d42f2 100644 --- a/src/jtag/parport.c +++ b/src/jtag/parport.c @@ -62,21 +62,21 @@ typedef struct cable_s { char* name; - u8 TDO_MASK; /* status port bit containing current TDO value */ - u8 TRST_MASK; /* data port bit for TRST */ - u8 TMS_MASK; /* data port bit for TMS */ - u8 TCK_MASK; /* data port bit for TCK */ - u8 TDI_MASK; /* data port bit for TDI */ - u8 SRST_MASK; /* data port bit for SRST */ - u8 OUTPUT_INVERT; /* data port bits that should be inverted */ - u8 INPUT_INVERT; /* status port that should be inverted */ - u8 PORT_INIT; /* initialize data port with this value */ - u8 PORT_EXIT; /* de-initialize data port with this value */ - u8 LED_MASK; /* data port bit for LED */ + uint8_t TDO_MASK; /* status port bit containing current TDO value */ + uint8_t TRST_MASK; /* data port bit for TRST */ + uint8_t TMS_MASK; /* data port bit for TMS */ + uint8_t TCK_MASK; /* data port bit for TCK */ + uint8_t TDI_MASK; /* data port bit for TDI */ + uint8_t SRST_MASK; /* data port bit for SRST */ + uint8_t OUTPUT_INVERT; /* data port bits that should be inverted */ + uint8_t INPUT_INVERT; /* status port that should be inverted */ + uint8_t PORT_INIT; /* initialize data port with this value */ + uint8_t PORT_EXIT; /* de-initialize data port with this value */ + uint8_t LED_MASK; /* data port bit for LED */ } cable_t; -static cable_t cables[] = -{ +static cable_t cables[] = +{ /* name tdo trst tms tck tdi srst o_inv i_inv init exit led */ { "wiggler", 0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x01, 0x80, 0x80, 0x80, 0x00 }, { "wiggler2", 0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x01, 0x80, 0x80, 0x00, 0x20 }, @@ -103,13 +103,13 @@ static cable_t cables[] = /* configuration */ static char* parport_cable = NULL; -static u16 parport_port; +static uint16_t parport_port; static int parport_exit = 0; /* interface variables */ static cable_t* cable; -static u8 dataport_value = 0x0; +static uint8_t dataport_value = 0x0; #if PARPORT_USE_PPDEV == 1 static int device_handle; @@ -135,13 +135,13 @@ static int parport_handle_parport_port_command(struct command_context_s *cmd_ctx static int parport_handle_parport_cable_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int parport_handle_write_on_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -jtag_interface_t parport_interface = +jtag_interface_t parport_interface = { .name = "parport", - + .execute_queue = bitbang_execute_queue, - .speed = parport_speed, + .speed = parport_speed, .register_commands = parport_register_commands, .init = parport_init, .quit = parport_quit, @@ -158,7 +158,7 @@ static bitbang_interface_t parport_bitbang = static int parport_read(void) { int data = 0; - + #if PARPORT_USE_PPDEV == 1 ioctl(device_handle, PPRSTATUS, & data); #else @@ -173,7 +173,7 @@ static int parport_read(void) static __inline__ void parport_write_data(void) { - u8 output; + uint8_t output; output = dataport_value ^ cable->OUTPUT_INVERT; #if PARPORT_USE_PPDEV == 1 @@ -189,23 +189,23 @@ static __inline__ void parport_write_data(void) static void parport_write(int tck, int tms, int tdi) { - int i = jtag_speed + 1; - + int i = jtag_get_speed() + 1; + if (tck) dataport_value |= cable->TCK_MASK; else dataport_value &= ~cable->TCK_MASK; - + if (tms) dataport_value |= cable->TMS_MASK; else dataport_value &= ~cable->TMS_MASK; - + if (tdi) dataport_value |= cable->TDI_MASK; else dataport_value &= ~cable->TDI_MASK; - + while (i-- > 0) parport_write_data(); } @@ -224,10 +224,10 @@ static void parport_reset(int trst, int srst) dataport_value |= cable->SRST_MASK; else if (srst == 1) dataport_value &= ~cable->SRST_MASK; - + parport_write_data(); } - + /* turn LED on parport adapter on (1) or off (0) */ static void parport_led(int on) { @@ -261,7 +261,7 @@ static int parport_get_giveio_access(void) { HANDLE h; OSVERSIONINFO version; - + version.dwOSVersionInfoSize = sizeof version; if (!GetVersionEx( &version )) { errno = EINVAL; @@ -269,15 +269,15 @@ static int parport_get_giveio_access(void) } 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 @@ -289,15 +289,15 @@ static int parport_init(void) char buffer[256]; int i = 0; #endif - + cur_cable = cables; - + if ((parport_cable == NULL) || (parport_cable[0] == 0)) { parport_cable = "wiggler"; LOG_WARNING("No parport cable specified, using default 'wiggler'"); } - + while (cur_cable->name) { if (strcmp(cur_cable->name, parport_cable) == 0) @@ -313,9 +313,9 @@ static int parport_init(void) LOG_ERROR("No matching cable found for %s", parport_cable); return ERROR_JTAG_INIT_FAILED; } - + dataport_value = cable->PORT_INIT; - + #if PARPORT_USE_PPDEV == 1 if (device_handle > 0) { @@ -344,7 +344,7 @@ static int parport_init(void) LOG_DEBUG("...open"); #if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - i=ioctl(device_handle, PPCLAIM); + i = ioctl(device_handle, PPCLAIM); if (i<0) { LOG_ERROR("cannot claim device"); @@ -374,10 +374,10 @@ static int parport_init(void) parport_port = 0x378; LOG_WARNING("No parport port specified, using default '0x378' (LPT1)"); } - + dataport = parport_port; statusport = parport_port + 1; - + LOG_DEBUG("requesting privileges for parallel port 0x%lx...", dataport); #if PARPORT_USE_GIVEIO == 1 if (parport_get_giveio_access() != 0) @@ -389,21 +389,21 @@ static int parport_init(void) return ERROR_JTAG_INIT_FAILED; } LOG_DEBUG("...privileges granted"); - + /* make sure parallel port is in right mode (clear tristate and interrupt */ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) outb(parport_port + 2, 0x0); #else outb(0x0, parport_port + 2); #endif - + #endif /* PARPORT_USE_PPDEV */ - + parport_reset(0, 0); parport_write(0, 0, 0); parport_led(1); - bitbang_interface = &parport_bitbang; + bitbang_interface = &parport_bitbang; return ERROR_OK; } @@ -417,24 +417,35 @@ static int parport_quit(void) dataport_value = cable->PORT_EXIT; parport_write_data(); } - + if (parport_cable) { free(parport_cable); parport_cable = NULL; } - + return ERROR_OK; } static int parport_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 (parport_port == 0) + { + int retval = parse_u16(args[0], &parport_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 (parport_port == 0) - parport_port = strtoul(args[0], NULL, 0); + command_print(cmd_ctx, "parport port = %u", parport_port); return ERROR_OK; } @@ -461,11 +472,11 @@ static int parport_handle_write_on_exit_command(struct command_context_s *cmd_ct command_print(cmd_ctx, "usage: parport_write_on_exit "); return ERROR_OK; } - + if (strcmp(args[0], "on") == 0) parport_exit = 1; else if (strcmp(args[0], "off") == 0) parport_exit = 0; - + return ERROR_OK; }