X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fjtag%2Famt_jtagaccel.c;h=b94b6f7605ef8dc51f0a74e65319bf6afae0b7ab;hb=3ce7afc0da96c07f652bd2a59187ce2454b4416b;hp=de3a6d33a6f59ec61b0f34a0c5605e3fdb478a16;hpb=966b912b65a5859dfe857dba41ca1ee1beff0b63;p=openocd

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index de3a6d33..b94b6f76 100644
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -34,9 +34,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 #if PARPORT_USE_PPDEV == 1
 #include <linux/parport.h>
 #include <linux/ppdev.h>
@@ -53,7 +50,6 @@
 #if IS_CYGWIN == 1
 #include <windows.h>
 #include <errno.h>
-#undef ERROR
 #endif
 #endif
 
@@ -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);
 	}
 }
@@ -344,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)
 				{
@@ -361,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);
@@ -369,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);
@@ -377,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);
@@ -391,12 +387,12 @@ int amt_jtagaccel_execute_queue(void)
 				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;
@@ -445,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;
 	}
 
@@ -454,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;
 	}
 
@@ -469,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;
 	}
 	
@@ -483,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
@@ -491,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;
 	}
 	
@@ -531,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;
 }