X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fparport.c;h=f9d7b0292b206178501edc1715484764dddf39bb;hb=796fa81a2b361fa0606f141906734672c910b343;hp=b9087d9fec525d5306313a8ced6d3a3339a6da46;hpb=20e4e77cdf366dedac21ff5670c54291feadfc05;p=openocd.git diff --git a/src/jtag/parport.c b/src/jtag/parport.c index b9087d9fec..f9d7b0292b 100644 --- a/src/jtag/parport.c +++ b/src/jtag/parport.c @@ -90,25 +90,39 @@ typedef struct cable_s 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 */ } cable_t; cable_t cables[] = { - /* name tdo trst tms tck tdi srst o_inv i_inv init */ - { "wiggler", 0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x01, 0x80, 0x80 }, - { "wiggler_ntrst_inverted", 0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x11, 0x80, 0x80 }, - { "old_amt_wiggler", 0x80, 0x01, 0x02, 0x04, 0x08, 0x10, 0x11, 0x80, 0x80 }, - { "chameleon", 0x80, 0x00, 0x04, 0x01, 0x02, 0x00, 0x00, 0x80, 0x00 }, - { "dlc5", 0x10, 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x10 }, - { "triton", 0x80, 0x08, 0x04, 0x01, 0x02, 0x00, 0x00, 0x80, 0x00 }, - { "lattice", 0x40, 0x10, 0x04, 0x02, 0x01, 0x08, 0x00, 0x00, 0x18 }, - { "flashlink", 0x20, 0x10, 0x02, 0x01, 0x04, 0x20, 0x30, 0x20, 0x00 }, - { NULL, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } + /* 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 }, + { "wiggler_ntrst_inverted", + 0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x11, 0x80, 0x80, 0x80, 0x00 }, + { "old_amt_wiggler", 0x80, 0x01, 0x02, 0x04, 0x08, 0x10, 0x11, 0x80, 0x80, 0x80, 0x00 }, + { "chameleon", 0x80, 0x00, 0x04, 0x01, 0x02, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 }, + { "dlc5", 0x10, 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00 }, + { "triton", 0x80, 0x08, 0x04, 0x01, 0x02, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 }, + { "lattice", 0x40, 0x10, 0x04, 0x02, 0x01, 0x08, 0x00, 0x00, 0x18, 0x18, 0x00 }, + { "flashlink", 0x20, 0x10, 0x02, 0x01, 0x04, 0x20, 0x30, 0x20, 0x00, 0x00, 0x00 }, +/* Altium Universal JTAG cable. Set the cable to Xilinx Mode and wire to target as follows: + HARD TCK - Target TCK + HARD TMS - Target TMS + HARD TDI - Target TDI + HARD TDO - Target TDO + SOFT TCK - Target TRST + SOFT TDI - Target SRST +*/ + { "altium", 0x10, 0x20, 0x04, 0x02, 0x01, 0x80, 0x00, 0x00, 0x10, 0x00, 0x08 }, + { NULL, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; /* configuration */ -char* parport_cable; +char* parport_cable = NULL; unsigned long parport_port; +static int parport_exit = 0; /* interface variables */ @@ -127,6 +141,7 @@ static unsigned long statusport; int parport_read(void); void parport_write(int tck, int tms, int tdi); void parport_reset(int trst, int srst); +void parport_led(int on); int parport_speed(int speed); int parport_register_commands(struct command_context_s *cmd_ctx); @@ -136,6 +151,7 @@ int parport_quit(void); /* interface commands */ int parport_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int parport_handle_parport_cable_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int parport_handle_write_on_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); jtag_interface_t parport_interface = { @@ -143,8 +159,6 @@ jtag_interface_t parport_interface = .execute_queue = bitbang_execute_queue, - .support_pathmove = 1, - .speed = parport_speed, .register_commands = parport_register_commands, .init = parport_init, @@ -155,7 +169,8 @@ bitbang_interface_t parport_bitbang = { .read = parport_read, .write = parport_write, - .reset = parport_reset + .reset = parport_reset, + .blink = parport_led }; int parport_read(void) @@ -174,9 +189,24 @@ int parport_read(void) return 0; } -void parport_write(int tck, int tms, int tdi) +static inline void parport_write_data(void) { u8 output; + output = dataport_value ^ cable->OUTPUT_INVERT; + +#if PARPORT_USE_PPDEV == 1 + ioctl(device_handle, PPWDATA, &output); +#else +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + outb(dataport, output); +#else + outb(output, dataport); +#endif +#endif +} + +void parport_write(int tck, int tms, int tdi) +{ int i = jtag_speed + 1; if (tck) @@ -194,24 +224,13 @@ void parport_write(int tck, int tms, int tdi) else dataport_value &= ~cable->TDI_MASK; - output = dataport_value ^ cable->OUTPUT_INVERT; - while (i-- > 0) -#if PARPORT_USE_PPDEV == 1 - ioctl(device_handle, PPWDATA, &output); -#else -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - outb(dataport, output); -#else - outb(output, dataport); -#endif -#endif + parport_write_data(); } /* (1) assert or (0) deassert reset lines */ void parport_reset(int trst, int srst) { - u8 output; DEBUG("trst: %i, srst: %i", trst, srst); if (trst == 0) @@ -224,18 +243,18 @@ void parport_reset(int trst, int srst) else if (srst == 1) dataport_value &= ~cable->SRST_MASK; - output = dataport_value ^ cable->OUTPUT_INVERT; + parport_write_data(); +} -#if PARPORT_USE_PPDEV == 1 - ioctl(device_handle, PPWDATA, &output); -#else -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - outb(dataport, output); -#else - outb(output, dataport); -#endif -#endif +/* turn LED on parport adapter on (1) or off (0) */ +void parport_led(int on) +{ + if (on) + dataport_value |= cable->LED_MASK; + else + dataport_value &= ~cable->LED_MASK; + parport_write_data(); } int parport_speed(int speed) @@ -251,6 +270,8 @@ int parport_register_commands(struct command_context_s *cmd_ctx) COMMAND_CONFIG, NULL); register_command(cmd_ctx, NULL, "parport_cable", parport_handle_parport_cable_command, COMMAND_CONFIG, NULL); + register_command(cmd_ctx, NULL, "parport_write_on_exit", parport_handle_write_on_exit_command, + COMMAND_CONFIG, NULL); return ERROR_OK; } @@ -400,6 +421,7 @@ int parport_init(void) parport_reset(0, 0); parport_write(0, 0, 0); + parport_led(1); bitbang_interface = &parport_bitbang; @@ -408,7 +430,20 @@ int parport_init(void) int parport_quit(void) { + parport_led(0); + if (parport_exit) + { + dataport_value = cable->PORT_EXIT; + parport_write_data(); + } + + if (parport_cable) + { + free(parport_cable); + parport_cable = NULL; + } + return ERROR_OK; } @@ -438,3 +473,19 @@ int parport_handle_parport_cable_command(struct command_context_s *cmd_ctx, char return ERROR_OK; } + +int parport_handle_write_on_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + if (argc != 1) + { + 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; +}