X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fparport.c;h=b80626f57d5dcd518f85830303ab83a95a368052;hb=c46c2d77e63264a9f0187a477b77032d0ce6fcfa;hp=fdf7df4da0de60a4bc31c1010f8f77f60ae6c146;hpb=8d6dcb9d39f0f948ef44beff991337b830fc4567;p=openocd.git diff --git a/src/jtag/parport.c b/src/jtag/parport.c index fdf7df4da0..b80626f57d 100644 --- a/src/jtag/parport.c +++ b/src/jtag/parport.c @@ -59,8 +59,7 @@ /* parallel port cable description */ -typedef struct cable_s -{ +struct cable { char* name; uint8_t TDO_MASK; /* status port bit containing current TDO value */ uint8_t TRST_MASK; /* data port bit for TRST */ @@ -73,9 +72,9 @@ typedef struct cable_s 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 struct cable 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 }, @@ -104,11 +103,13 @@ static cable_t cables[] = /* configuration */ static char* parport_cable = NULL; static uint16_t parport_port; -static int parport_exit = 0; +static bool parport_exit = 0; +static uint32_t parport_toggling_time_ns = 1000; +static int wait_states; /* interface variables */ -static cable_t* cable; +static struct cable* cable; static uint8_t dataport_value = 0x0; #if PARPORT_USE_PPDEV == 1 @@ -152,7 +153,7 @@ static __inline__ void parport_write_data(void) static void parport_write(int tck, int tms, int tdi) { - int i = jtag_get_speed() + 1; + int i = wait_states + 1; if (tck) dataport_value |= cable->TCK_MASK; @@ -204,6 +205,26 @@ static void parport_led(int on) static int parport_speed(int speed) { + wait_states = speed; + return ERROR_OK; +} + +static int parport_khz(int khz, int* jtag_speed) +{ + 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; } @@ -233,7 +254,7 @@ static int parport_get_giveio_access(void) } #endif -static bitbang_interface_t parport_bitbang = { +static struct bitbang_interface parport_bitbang = { .read = &parport_read, .write = &parport_write, .reset = &parport_reset, @@ -242,7 +263,7 @@ static bitbang_interface_t parport_bitbang = { static int parport_init(void) { - cable_t *cur_cable; + struct cable *cur_cable; #if PARPORT_USE_PPDEV == 1 char buffer[256]; int i = 0; @@ -364,6 +385,8 @@ static int parport_init(void) bitbang_interface = &parport_bitbang; + wait_states = jtag_get_speed(); + return ERROR_OK; } @@ -386,14 +409,14 @@ static int parport_quit(void) 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 == 1) + if (CMD_ARGC == 1) { /* only if the port wasn't overwritten by cmdline */ if (parport_port == 0) { - COMMAND_PARSE_NUMBER(u16, args[0], parport_port); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], parport_port); } else { @@ -402,43 +425,64 @@ static int parport_handle_parport_port_command(struct command_context_s *cmd_ctx } } - command_print(cmd_ctx, "parport port = %u", parport_port); + 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) + if (CMD_ARGC == 0) return ERROR_OK; /* only if the cable name wasn't overwritten by cmdline */ if (parport_cable == 0) { - parport_cable = malloc(strlen(args[0]) + sizeof(char)); - strcpy(parport_cable, args[0]); + parport_cable = malloc(strlen(CMD_ARGV[0]) + sizeof(char)); + strcpy(parport_cable, CMD_ARGV[0]); } 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) + if (CMD_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; + COMMAND_PARSE_ON_OFF(CMD_ARGV[0], parport_exit); return ERROR_OK; } -static int parport_register_commands(struct command_context_s *cmd_ctx) +COMMAND_HANDLER(parport_handle_parport_toggling_time_command) +{ + if (CMD_ARGC == 1) { + uint32_t ns; + int retval = parse_u32(CMD_ARGV[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 *cmd_ctx) { register_command(cmd_ctx, NULL, "parport_port", parport_handle_parport_port_command, COMMAND_CONFIG, @@ -455,14 +499,20 @@ static int parport_register_commands(struct command_context_s *cmd_ctx) "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, - .speed = &parport_speed, - .execute_queue = &bitbang_execute_queue, - }; +struct jtag_interface 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, +};