- fixed arm926 cp15 command bug (thanks to Vincent Palatin for this patch)

- fixed compiler warnings throughout the code (thanks to Vincent Palatin for this patch)
- added support for accessing ETB (embedded trace buffer) registers


git-svn-id: svn://svn.berlios.de/openocd/trunk@134 b42882b7-edfa-0310-969c-e2dbd0fdcd60

4 files changed, 15 insertions, 15 deletions

diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 4a705b5e..2a8c7387 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -161,7 +161,7 @@ int ft2232_write(u8 *buf, int size, u32* bytes_written)
 	if ((status = FT_Write(ftdih, buf, size, &dw_bytes_written)) != FT_OK)
 	{
 		*bytes_written = dw_bytes_written;
-		ERROR("FT_Write returned: %i", status);
+		ERROR("FT_Write returned: %lu", status);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
 	else
@@ -198,7 +198,7 @@ int ft2232_read(u8* buf, int size, u32* bytes_read)
 		if ((status = FT_Read(ftdih, buf, size, &dw_bytes_read)) != FT_OK)
 		{
 			*bytes_read = 0; 
-			ERROR("FT_Read returned: %i", status);
+			ERROR("FT_Read returned: %lu", status);
 			return ERROR_JTAG_DEVICE_ERROR;
 		}
 		*bytes_read += dw_bytes_read; 
@@ -1165,7 +1165,7 @@ int ft2232_execute_queue()
 				}
 				else if (ft2232_buffer_size + predicted_size + 1 > FT2232_BUFFER_SIZE)
 				{
-					DEBUG("ft2232 buffer size reached, sending queued commands (first_unsent: %x, cmd: %x)", first_unsent, cmd);
+					DEBUG("ft2232 buffer size reached, sending queued commands (first_unsent: %p, cmd: %p)", first_unsent, cmd);
 					ft2232_send_and_recv(first_unsent, cmd);
 					require_send = 0;
 					first_unsent = cmd;
@@ -1283,7 +1283,7 @@ int ft2232_init(void)
 	{
 		DWORD num_devices;
 		
-		ERROR("unable to open ftdi device: %i", status);
+		ERROR("unable to open ftdi device: %lu", status);
 		status = FT_ListDevices(&num_devices, NULL, FT_LIST_NUMBER_ONLY);
 		if (status == FT_OK)
 		{
@@ -1298,7 +1298,7 @@ int ft2232_init(void)
 
 			if (status == FT_OK)
 			{
-				ERROR("ListDevices: %d\n", num_devices);
+				ERROR("ListDevices: %lu\n", num_devices);
 				for (i = 0; i < num_devices; i++)
 					ERROR("%i: %s", i, desc_array[i]);
 			}
@@ -1316,13 +1316,13 @@ int ft2232_init(void)
 
 	if ((status = FT_SetLatencyTimer(ftdih, 2)) != FT_OK)
 	{
-		ERROR("unable to set latency timer: %i", status);
+		ERROR("unable to set latency timer: %lu", status);
 		return ERROR_JTAG_INIT_FAILED;
 	}
 	
 	if ((status = FT_GetLatencyTimer(ftdih, &latency_timer)) != FT_OK)
 	{
-		ERROR("unable to get latency timer: %i", status);
+		ERROR("unable to get latency timer: %lu", status);
 		return ERROR_JTAG_INIT_FAILED;
 	}
 	else
@@ -1332,13 +1332,13 @@ int ft2232_init(void)
 	
 	if ((status = FT_SetTimeouts(ftdih, 5000, 5000)) != FT_OK)
 	{
-		ERROR("unable to set timeouts: %i", status);
+		ERROR("unable to set timeouts: %lu", status);
 		return ERROR_JTAG_INIT_FAILED;
 	}
 
 	if ((status = FT_SetBitMode(ftdih, 0x0b, 2)) != FT_OK)
 	{
-		ERROR("unable to enable bit i/o mode: %i", status);
+		ERROR("unable to enable bit i/o mode: %lu", status);
 		return ERROR_JTAG_INIT_FAILED;
 	}
 #elif BUILD_FT2232_LIBFTDI == 1
@@ -1401,7 +1401,7 @@ int ft2232_init(void)
 #if BUILD_FT2232_FTD2XX == 1
 	if ((status = FT_Purge(ftdih, FT_PURGE_RX | FT_PURGE_TX)) != FT_OK)
 	{
-		ERROR("error purging ftd2xx device: %i", status);
+		ERROR("error purging ftd2xx device: %lu", status);
 		return ERROR_JTAG_INIT_FAILED;
 	}
 #elif BUILD_FT2232_LIBFTDI == 1
diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 8211fee3..1f1f6086 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -421,7 +421,7 @@ int gw16012_execute_queue(void)
 				break;
 			case JTAG_SLEEP:
 #ifdef _DEBUG_JTAG_IO_
-				DEBUG("sleep", cmd->cmd.sleep->us);
+				DEBUG("sleep %i", cmd->cmd.sleep->us);
 #endif
 				jtag_sleep(cmd->cmd.sleep->us);
 				break;
@@ -527,7 +527,7 @@ int gw16012_init(void)
 		WARNING("No gw16012 port specified, using default '0x378' (LPT1)");
 	}
 	
-	DEBUG("requesting privileges for parallel port 0x%x...", gw16012_port);
+	DEBUG("requesting privileges for parallel port 0x%lx...", gw16012_port);
 #if PARPORT_USE_GIVEIO == 1
 	if (gw16012_get_giveio_access() != 0)
 #else /* PARPORT_USE_GIVEIO */
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index b8d963b1..13041fc1 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1123,7 +1123,7 @@ int jtag_reset_callback(enum jtag_event event, void *priv)
 {
 	jtag_device_t *device = priv;
 
-	DEBUG("");
+	DEBUG("-");
 	
 	if (event == JTAG_TRST_ASSERTED)
 	{
@@ -1332,7 +1332,7 @@ int jtag_init(struct command_context_s *cmd_ctx)
 {
 	int i;
 	
-	DEBUG("");
+	DEBUG("-");
 
 	if (jtag_speed == -1)
 		jtag_speed = 0;
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 29e3da60..ad038ae5 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -25,7 +25,7 @@
 
 #include "command.h"
 
-#if 0
+#if 1
 #define _DEBUG_JTAG_IO_
 #endif