X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fparport.c;h=714cb1daadaed537db148139512bba38b0c55e39;hp=ff75859518a30054d5e31f80802ff69b400d1ad5;hb=679dcd0b52f6bafe848eb48e714764d37a101bb5;hpb=b675edcc95935cbdf77002db1e261536026f4cbe diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c index ff75859518..714cb1daad 100644 --- a/src/jtag/drivers/parport.c +++ b/src/jtag/drivers/parport.c @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include #include #include "bitbang.h" @@ -118,7 +117,7 @@ static unsigned long dataport; static unsigned long statusport; #endif -static int parport_read(void) +static bb_value_t parport_read(void) { int data = 0; @@ -129,9 +128,9 @@ static int parport_read(void) #endif if ((data ^ cable->INPUT_INVERT) & cable->TDO_MASK) - return 1; + return BB_HIGH; else - return 0; + return BB_LOW; } static inline void parport_write_data(void) @@ -150,7 +149,7 @@ static inline void parport_write_data(void) #endif } -static void parport_write(int tck, int tms, int tdi) +static int parport_write(int tck, int tms, int tdi) { int i = wait_states + 1; @@ -171,10 +170,12 @@ static void parport_write(int tck, int tms, int tdi) while (i-- > 0) parport_write_data(); + + return ERROR_OK; } /* (1) assert or (0) deassert reset lines */ -static void parport_reset(int trst, int srst) +static int parport_reset(int trst, int srst) { LOG_DEBUG("trst: %i, srst: %i", trst, srst); @@ -189,10 +190,12 @@ static void parport_reset(int trst, int srst) dataport_value &= ~cable->SRST_MASK; parport_write_data(); + + return ERROR_OK; } /* turn LED on parport adapter on (1) or off (0) */ -static void parport_led(int on) +static int parport_led(int on) { if (on) dataport_value |= cable->LED_MASK; @@ -200,6 +203,8 @@ static void parport_led(int on) dataport_value &= ~cable->LED_MASK; parport_write_data(); + + return ERROR_OK; } static int parport_speed(int speed) @@ -233,7 +238,7 @@ static int parport_get_giveio_access(void) HANDLE h; OSVERSIONINFO version; - version.dwOSVersionInfoSize = sizeof version; + version.dwOSVersionInfoSize = sizeof(version); if (!GetVersionEx(&version)) { errno = EINVAL; return -1; @@ -256,7 +261,6 @@ static int parport_get_giveio_access(void) static struct bitbang_interface parport_bitbang = { .read = &parport_read, .write = &parport_write, - .reset = &parport_reset, .blink = &parport_led, }; @@ -269,7 +273,7 @@ static int parport_init(void) cur_cable = cables; - if (parport_cable == NULL) { + if (!parport_cable) { parport_cable = strdup("wiggler"); LOG_WARNING("No parport cable specified, using default 'wiggler'"); } @@ -367,9 +371,12 @@ static int parport_init(void) #endif /* PARPORT_USE_PPDEV */ - parport_reset(0, 0); - parport_write(0, 0, 0); - parport_led(1); + if (parport_reset(0, 0) != ERROR_OK) + return ERROR_FAIL; + if (parport_write(0, 0, 0) != ERROR_OK) + return ERROR_FAIL; + if (parport_led(1) != ERROR_OK) + return ERROR_FAIL; bitbang_interface = &parport_bitbang; @@ -378,17 +385,16 @@ static int parport_init(void) static int parport_quit(void) { - parport_led(0); + if (parport_led(0) != ERROR_OK) + return ERROR_FAIL; if (parport_exit) { dataport_value = cable->PORT_EXIT; parport_write_data(); } - if (parport_cable) { - free(parport_cable); - parport_cable = NULL; - } + free(parport_cable); + parport_cable = NULL; return ERROR_OK; } @@ -405,7 +411,7 @@ COMMAND_HANDLER(parport_handle_parport_port_command) } } - command_print(CMD_CTX, "parport port = 0x%" PRIx16 "", parport_port); + command_print(CMD, "parport port = 0x%" PRIx16 "", parport_port); return ERROR_OK; } @@ -443,7 +449,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command) uint32_t ns; int retval = parse_u32(CMD_ARGV[0], &ns); - if (ERROR_OK != retval) + if (retval != ERROR_OK) return retval; if (ns == 0) { @@ -462,15 +468,15 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command) } } - command_print(CMD_CTX, "parport toggling time = %" PRIu32 " ns", + command_print(CMD, "parport toggling time = %" PRIu32 " ns", parport_toggling_time_ns); return ERROR_OK; } -static const struct command_registration parport_command_handlers[] = { +static const struct command_registration parport_subcommand_handlers[] = { { - .name = "parport_port", + .name = "port", .handler = parport_handle_parport_port_command, .mode = COMMAND_CONFIG, .help = "Display the address of the I/O port (e.g. 0x378) " @@ -479,7 +485,7 @@ static const struct command_registration parport_command_handlers[] = { .usage = "[port_number]", }, { - .name = "parport_cable", + .name = "cable", .handler = parport_handle_parport_cable_command, .mode = COMMAND_CONFIG, .help = "Set the layout of the parallel port cable " @@ -488,7 +494,7 @@ static const struct command_registration parport_command_handlers[] = { .usage = "[layout]", }, { - .name = "parport_write_on_exit", + .name = "write_on_exit", .handler = parport_handle_write_on_exit_command, .mode = COMMAND_CONFIG, .help = "Configure the parallel driver to write " @@ -496,7 +502,7 @@ static const struct command_registration parport_command_handlers[] = { .usage = "('on'|'off')", }, { - .name = "parport_toggling_time", + .name = "toggling_time", .handler = parport_handle_parport_toggling_time_command, .mode = COMMAND_CONFIG, .help = "Displays or assigns how many nanoseconds it " @@ -506,15 +512,33 @@ static const struct command_registration parport_command_handlers[] = { COMMAND_REGISTRATION_DONE }; -struct jtag_interface parport_interface = { - .name = "parport", +static const struct command_registration parport_command_handlers[] = { + { + .name = "parport", + .mode = COMMAND_ANY, + .help = "perform parport management", + .chain = parport_subcommand_handlers, + .usage = "", + }, + COMMAND_REGISTRATION_DONE +}; + +static struct jtag_interface parport_interface = { .supported = DEBUG_CAP_TMS_SEQ, + .execute_queue = bitbang_execute_queue, +}; + +struct adapter_driver parport_adapter_driver = { + .name = "parport", + .transports = jtag_only, .commands = parport_command_handlers, .init = parport_init, .quit = parport_quit, + .reset = parport_reset, + .speed = parport_speed, .khz = parport_khz, .speed_div = parport_speed_div, - .speed = parport_speed, - .execute_queue = bitbang_execute_queue, + + .jtag_ops = &parport_interface, };