X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fjtag%2Famt_jtagaccel.c;h=b94b6f7605ef8dc51f0a74e65319bf6afae0b7ab;hb=3ce7afc0da96c07f652bd2a59187ce2454b4416b;hp=ac2635207f701b1be9c3292ca6761f1ae63e26fd;hpb=4a5f45e87d593d6911da680cb92ffbc9b43c9486;p=openocd diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index ac263520..b94b6f76 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -27,38 +27,36 @@ /* system includes */ -#ifndef _WIN32 -#include -#else +#ifdef _WIN32 #include "errno.h" #endif /* _WIN32 */ #include #include -#include -#include - #if PARPORT_USE_PPDEV == 1 #include #include #include #include #include +#else /* not PARPORT_USE_PPDEV */ +#ifndef _WIN32 +#include +#endif #endif #if PARPORT_USE_GIVEIO == 1 #if IS_CYGWIN == 1 #include #include -#undef ERROR #endif #endif #include "log.h" /* configuration */ -unsigned long amt_jtagaccel_port; +u16 amt_jtagaccel_port; /* interface variables */ @@ -117,8 +115,6 @@ jtag_interface_t amt_jtagaccel_interface = .execute_queue = amt_jtagaccel_execute_queue, - .support_pathmove = 0, - .speed = amt_jtagaccel_speed, .register_commands = amt_jtagaccel_register_commands, .init = amt_jtagaccel_init, @@ -165,7 +161,7 @@ void amt_jtagaccel_end_state(state) end_state = state; else { - ERROR("BUG: %i is not a valid end state", state); + LOG_ERROR("BUG: %i is not a valid end state", state); exit(-1); } } @@ -181,7 +177,7 @@ void amt_wait_scan_busy() if (ar_status & 0x80) { - ERROR("amt_jtagaccel timed out while waiting for end of scan, rtck was %s, last AR_STATUS: 0x%2.2x", (rtck_enabled) ? "enabled" : "disabled", ar_status); + LOG_ERROR("amt_jtagaccel timed out while waiting for end of scan, rtck was %s, last AR_STATUS: 0x%2.2x", (rtck_enabled) ? "enabled" : "disabled", ar_status); exit(-1); } } @@ -331,6 +327,12 @@ int amt_jtagaccel_execute_queue(void) int scan_size; enum scan_type type; u8 *buffer; + int retval; + + /* return ERROR_OK, unless a jtag_read_buffer returns a failed check + * that wasn't handled by a caller-provided error handler + */ + retval = ERROR_OK; while (cmd) { @@ -338,14 +340,14 @@ int amt_jtagaccel_execute_queue(void) { case JTAG_END_STATE: #ifdef _DEBUG_JTAG_IO_ - DEBUG("end_state: %i", cmd->cmd.end_state->end_state); + LOG_DEBUG("end_state: %i", cmd->cmd.end_state->end_state); #endif if (cmd->cmd.end_state->end_state != -1) amt_jtagaccel_end_state(cmd->cmd.end_state->end_state); break; case JTAG_RESET: #ifdef _DEBUG_JTAG_IO_ - DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst); + LOG_DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst); #endif if (cmd->cmd.reset->trst == 1) { @@ -355,7 +357,7 @@ int amt_jtagaccel_execute_queue(void) break; case JTAG_RUNTEST: #ifdef _DEBUG_JTAG_IO_ - DEBUG("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, cmd->cmd.runtest->end_state); + LOG_DEBUG("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, cmd->cmd.runtest->end_state); #endif if (cmd->cmd.runtest->end_state != -1) amt_jtagaccel_end_state(cmd->cmd.runtest->end_state); @@ -363,7 +365,7 @@ int amt_jtagaccel_execute_queue(void) break; case JTAG_STATEMOVE: #ifdef _DEBUG_JTAG_IO_ - DEBUG("statemove end in %i", cmd->cmd.statemove->end_state); + LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state); #endif if (cmd->cmd.statemove->end_state != -1) amt_jtagaccel_end_state(cmd->cmd.statemove->end_state); @@ -371,7 +373,7 @@ int amt_jtagaccel_execute_queue(void) break; case JTAG_SCAN: #ifdef _DEBUG_JTAG_IO_ - DEBUG("scan end in %i", cmd->cmd.scan->end_state); + LOG_DEBUG("scan end in %i", cmd->cmd.scan->end_state); #endif if (cmd->cmd.scan->end_state != -1) amt_jtagaccel_end_state(cmd->cmd.scan->end_state); @@ -379,24 +381,24 @@ int amt_jtagaccel_execute_queue(void) type = jtag_scan_type(cmd->cmd.scan); amt_jtagaccel_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size); if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK) - return ERROR_JTAG_QUEUE_FAILED; + retval = ERROR_JTAG_QUEUE_FAILED; if (buffer) free(buffer); break; case JTAG_SLEEP: #ifdef _DEBUG_JTAG_IO_ - DEBUG("sleep %i", cmd->cmd.sleep->us); + LOG_DEBUG("sleep %i", cmd->cmd.sleep->us); #endif jtag_sleep(cmd->cmd.sleep->us); break; default: - ERROR("BUG: unknown JTAG command type encountered"); + LOG_ERROR("BUG: unknown JTAG command type encountered"); exit(-1); } cmd = cmd->next; } - return ERROR_OK; + return retval; } #if PARPORT_USE_GIVEIO == 1 @@ -439,7 +441,7 @@ int amt_jtagaccel_init(void) #if PARPORT_USE_PPDEV == 1 if (device_handle > 0) { - ERROR("device is already opened"); + LOG_ERROR("device is already opened"); return ERROR_JTAG_INIT_FAILED; } @@ -448,14 +450,14 @@ int amt_jtagaccel_init(void) if (device_handle < 0) { - ERROR("cannot open device. check it exists and that user read and write rights are set"); + LOG_ERROR("cannot open device. check it exists and that user read and write rights are set"); return ERROR_JTAG_INIT_FAILED; } i = ioctl(device_handle, PPCLAIM); if (i < 0) { - ERROR("cannot claim device"); + LOG_ERROR("cannot claim device"); return ERROR_JTAG_INIT_FAILED; } @@ -463,7 +465,7 @@ int amt_jtagaccel_init(void) i = ioctl(device_handle, PPSETMODE, & i); if (i < 0) { - ERROR(" cannot set compatible mode to device"); + LOG_ERROR(" cannot set compatible mode to device"); return ERROR_JTAG_INIT_FAILED; } @@ -477,7 +479,7 @@ int amt_jtagaccel_init(void) if (amt_jtagaccel_port == 0) { amt_jtagaccel_port = 0x378; - WARNING("No parport port specified, using default '0x378' (LPT1)"); + LOG_WARNING("No parport port specified, using default '0x378' (LPT1)"); } #if PARPORT_USE_GIVEIO == 1 @@ -485,7 +487,7 @@ int amt_jtagaccel_init(void) #else /* PARPORT_USE_GIVEIO */ if (ioperm(amt_jtagaccel_port, 5, 1) != 0) { #endif /* PARPORT_USE_GIVEIO */ - ERROR("missing privileges for direct i/o"); + LOG_ERROR("missing privileges for direct i/o"); return ERROR_JTAG_INIT_FAILED; } @@ -525,7 +527,7 @@ int amt_jtagaccel_init(void) /* read status register */ AMT_AR(ar_status); - DEBUG("AR_STATUS: 0x%2.2x", ar_status); + LOG_DEBUG("AR_STATUS: 0x%2.2x", ar_status); return ERROR_OK; }