X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fparport.c;h=b3abd120567e974c05248396992d05382675bca8;hp=7dd842e0fcfe1fbdce578eeb64292281116593db;hb=e66bb9d3121eef35c312997aacb401847249a5cb;hpb=0a33b7b2aa25b8eba53c9097ac2c92c5be7f0227 diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c index 7dd842e0fc..b3abd12056 100644 --- a/src/jtag/drivers/parport.c +++ b/src/jtag/drivers/parport.c @@ -16,9 +16,7 @@ * 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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -60,7 +58,7 @@ /* parallel port cable description */ struct cable { - char *name; + const char *name; 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 */ @@ -74,7 +72,7 @@ struct cable { uint8_t LED_MASK; /* data port bit for LED */ }; -static struct cable cables[] = { +static const 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 }, { "wiggler2", 0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x01, 0x80, 0x80, 0x00, 0x20 }, @@ -95,6 +93,7 @@ static struct cable cables[] = { SOFT TDI - Target SRST */ { "altium", 0x10, 0x20, 0x04, 0x02, 0x01, 0x80, 0x00, 0x00, 0x10, 0x00, 0x08 }, + { "aspo", 0x10, 0x01, 0x04, 0x08, 0x02, 0x10, 0x17, 0x00, 0x17, 0x17, 0x00 }, { NULL, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; @@ -107,7 +106,7 @@ static int wait_states; /* interface variables */ -static struct cable *cable; +static const struct cable *cable; static uint8_t dataport_value; #if PARPORT_USE_PPDEV == 1 @@ -117,7 +116,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; @@ -128,9 +127,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) @@ -149,7 +148,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; @@ -170,10 +169,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); @@ -188,10 +189,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; @@ -199,6 +202,8 @@ static void parport_led(int on) dataport_value &= ~cable->LED_MASK; parport_write_data(); + + return ERROR_OK; } static int parport_speed(int speed) @@ -232,7 +237,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; @@ -255,13 +260,12 @@ 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, }; static int parport_init(void) { - struct cable *cur_cable; + const struct cable *cur_cable; #if PARPORT_USE_PPDEV == 1 char buffer[256]; #endif @@ -366,9 +370,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; @@ -377,7 +384,8 @@ 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; @@ -404,7 +412,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; } @@ -461,7 +469,7 @@ 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; @@ -505,15 +513,22 @@ static const struct command_registration parport_command_handlers[] = { COMMAND_REGISTRATION_DONE }; -struct jtag_interface parport_interface = { - .name = "parport", +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, };