X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fparport.c;h=a18b3f6afc1f5419f760bcafeea1d29f8d4a1994;hp=51442304c959d725759b0d192bbb5e0346926a94;hb=63a26b421b1731df5826a157ea633b9d2c02aaee;hpb=a3e84343e202eb70ebce0ec1e8b15d7f9ce57f00 diff --git a/src/jtag/parport.c b/src/jtag/parport.c index 51442304c9..a18b3f6afc 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,15 @@ static cable_t cables[] = /* configuration */ static char* parport_cable = NULL; -static u16 parport_port; +static uint16_t parport_port; static int parport_exit = 0; +static uint32_t parport_toggling_time_ns = 1000; +static int wait_states; /* 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; @@ -118,47 +120,10 @@ static unsigned long dataport; static unsigned long statusport; #endif -/* low level command set - */ -static int parport_read(void); -static void parport_write(int tck, int tms, int tdi); -static void parport_reset(int trst, int srst); -static void parport_led(int on); - -static int parport_speed(int speed); -static int parport_register_commands(struct command_context_s *cmd_ctx); -static int parport_init(void); -static int parport_quit(void); - -/* interface commands */ -static int parport_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -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 = -{ - .name = "parport", - - .execute_queue = bitbang_execute_queue, - - .speed = parport_speed, - .register_commands = parport_register_commands, - .init = parport_init, - .quit = parport_quit, -}; - -static bitbang_interface_t parport_bitbang = -{ - .read = parport_read, - .write = parport_write, - .reset = parport_reset, - .blink = parport_led -}; - static int parport_read(void) { int data = 0; - + #if PARPORT_USE_PPDEV == 1 ioctl(device_handle, PPRSTATUS, & data); #else @@ -173,7 +138,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 +154,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 = wait_states + 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 +189,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) { @@ -241,18 +206,26 @@ static void parport_led(int on) static int parport_speed(int speed) { + wait_states = speed; return ERROR_OK; } -static int parport_register_commands(struct command_context_s *cmd_ctx) +static int parport_khz(int khz, int* jtag_speed) { - register_command(cmd_ctx, NULL, "parport_port", parport_handle_parport_port_command, - COMMAND_CONFIG, "either the address of the I/O port or the number of the ‘/dev/parport’ device"); - register_command(cmd_ctx, NULL, "parport_cable", parport_handle_parport_cable_command, - COMMAND_CONFIG, "the layout of the parallel port cable used to connect to the target"); - register_command(cmd_ctx, NULL, "parport_write_on_exit", parport_handle_write_on_exit_command, - COMMAND_CONFIG, "configure the parallel driver to write a known value to the parallel interface"); + if (khz == 0) { + LOG_DEBUG("RCLK not supported"); + return ERROR_FAIL; + } + *jtag_speed = 499999 / (khz * parport_toggling_time_ns); + return ERROR_OK; +} + +static int parport_speed_div(int speed, int* khz) +{ + uint32_t denominator = (speed + 1) * parport_toggling_time_ns; + + *khz = (499999 + denominator) / denominator; return ERROR_OK; } @@ -261,27 +234,34 @@ static int parport_get_giveio_access(void) { HANDLE h; 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; } #endif +static bitbang_interface_t parport_bitbang = { + .read = &parport_read, + .write = &parport_write, + .reset = &parport_reset, + .blink = &parport_led, + }; + static int parport_init(void) { cable_t *cur_cable; @@ -289,15 +269,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 +293,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) { @@ -337,15 +317,16 @@ static int parport_init(void) if (device_handle < 0) { - LOG_ERROR("cannot open device. check it exists and that user read and write rights are set"); + int err = errno; + LOG_ERROR("cannot open device. check it exists and that user read and write rights are set. errno=%d", err); return ERROR_JTAG_INIT_FAILED; } LOG_DEBUG("...open"); #if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - i=ioctl(device_handle, PPCLAIM); - if (i<0) + i = ioctl(device_handle, PPCLAIM); + if (i < 0) { LOG_ERROR("cannot claim device"); return ERROR_JTAG_INIT_FAILED; @@ -353,7 +334,7 @@ static int parport_init(void) i = PARPORT_MODE_COMPAT; i= ioctl(device_handle, PPSETMODE, & i); - if (i<0) + if (i < 0) { LOG_ERROR(" cannot set compatible mode to device"); return ERROR_JTAG_INIT_FAILED; @@ -361,7 +342,7 @@ static int parport_init(void) i = IEEE1284_MODE_COMPAT; i = ioctl(device_handle, PPNEGOT, & i); - if (i<0) + if (i < 0) { LOG_ERROR("cannot set compatible 1284 mode to device"); return ERROR_JTAG_INIT_FAILED; @@ -374,10 +355,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 +370,23 @@ 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; + + wait_states = jtag_get_speed(); return ERROR_OK; } @@ -417,29 +400,38 @@ 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) +COMMAND_HANDLER(parport_handle_parport_port_command) { - if (argc == 0) - return ERROR_OK; + if (argc == 1) + { + /* only if the port wasn't overwritten by cmdline */ + if (parport_port == 0) + { + COMMAND_PARSE_NUMBER(u16, args[0], parport_port); + } + 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; } -static int parport_handle_parport_cable_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(parport_handle_parport_cable_command) { if (argc == 0) return ERROR_OK; @@ -454,18 +446,77 @@ static int parport_handle_parport_cable_command(struct command_context_s *cmd_ct return ERROR_OK; } -static int parport_handle_write_on_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(parport_handle_write_on_exit_command) { if (argc != 1) { - command_print(cmd_ctx, "usage: parport_write_on_exit "); + 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; +} + +COMMAND_HANDLER(parport_handle_parport_toggling_time_command) +{ + if (argc == 1) { + uint32_t ns; + int retval = parse_u32(args[0], &ns); + + if (ERROR_OK != retval) + return retval; + + if (ns == 0) { + LOG_ERROR("0 ns is not a valid parport toggling time"); + return ERROR_FAIL; + } + + parport_toggling_time_ns = ns; + wait_states = jtag_get_speed(); + } + + command_print(cmd_ctx, "parport toggling time = %" PRIu32 " ns", + parport_toggling_time_ns); + + return ERROR_OK; +} + +static int parport_register_commands(struct command_context_s *cmd_ctx) +{ + register_command(cmd_ctx, NULL, "parport_port", + parport_handle_parport_port_command, COMMAND_CONFIG, + "either the address of the I/O port " + "or the number of the '/dev/parport' device"); + + register_command(cmd_ctx, NULL, "parport_cable", + parport_handle_parport_cable_command, COMMAND_CONFIG, + "the layout of the parallel port cable " + "used to connect to the target"); + + register_command(cmd_ctx, NULL, "parport_write_on_exit", + parport_handle_write_on_exit_command, COMMAND_CONFIG, + "configure the parallel driver to write " + "a known value to the parallel interface"); + + register_command(cmd_ctx, NULL, "parport_toggling_time", + parport_handle_parport_toggling_time_command, COMMAND_ANY, + "time it takes for the hardware to toggle TCK"); + return ERROR_OK; } + +jtag_interface_t parport_interface = { + .name = "parport", + .register_commands = parport_register_commands, + .init = parport_init, + .quit = parport_quit, + .khz = parport_khz, + .speed_div = parport_speed_div, + .speed = parport_speed, + .execute_queue = bitbang_execute_queue, +};