X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.c;h=2b21e7fd5a323ec7a239369f099a5235ca169dd3;hb=e2b6de3d66bae70cb08fea17f5b66ee875dbb636;hp=ff63820a2e4292886e50ac442fb9d8dd40e9e779;hpb=dbd95cb8a27ebe04ab7b788adbb83291bffb3e4f;p=openocd.git

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index ff63820a2e..2b21e7fd5a 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -21,6 +21,7 @@
 #include "config.h"
 #endif
 
+#define _GNU_SOURCE
 #include <string.h>
 #include <errno.h>
 
@@ -34,6 +35,7 @@
 #include "register.h"
 #include "jtag.h"
 #include "arm7_9_common.h"
+#include "replacements.h"
 
 #include <stdlib.h>
 
@@ -52,7 +54,7 @@ int oocd_trace_read_reg(oocd_trace_t *oocd_trace, int reg, u32 *value)
 		bytes_to_read -= bytes_read;
 	}
 
-	DEBUG("reg #%i: 0x%8.8x\n", reg, *value);
+	LOG_DEBUG("reg #%i: 0x%8.8x\n", reg, *value);
 	
 	return ERROR_OK;
 }
@@ -69,7 +71,7 @@ int oocd_trace_write_reg(oocd_trace_t *oocd_trace, int reg, u32 value)
     data[4] = (value & 0xff000000) >> 24;
 
     bytes_written = write(oocd_trace->tty_fd, data, 5);
-    DEBUG("reg #%i: 0x%8.8x\n", reg, value);
+    LOG_DEBUG("reg #%i: 0x%8.8x\n", reg, value);
 
     return ERROR_OK;
 }
@@ -78,7 +80,6 @@ int oocd_trace_read_memory(oocd_trace_t *oocd_trace, u8 *data, u32 address, u32
 {
 	size_t bytes_written, bytes_read, bytes_to_read;
 	u8 cmd;
-	int i;
 
 	oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, address);
 	oocd_trace_write_reg(oocd_trace, OOCD_TRACE_SDRAM_COUNTER, size);
@@ -92,7 +93,7 @@ int oocd_trace_read_memory(oocd_trace_t *oocd_trace, u8 *data, u32 address, u32
 		if ((bytes_read = read(oocd_trace->tty_fd,
 				((u8*)data) + (size * 16) - bytes_to_read, bytes_to_read)) < 0)
 		{
-			DEBUG("read() returned %i (%s)", bytes_read, strerror(errno));
+			LOG_DEBUG("read() returned %i (%s)", bytes_read, strerror(errno));
 		}
 		else
 			bytes_to_read -= bytes_read;
@@ -105,13 +106,13 @@ int oocd_trace_init(etm_context_t *etm_ctx)
 {
 	u8 trash[256];
 	oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv;
-	size_t bytes_written, bytes_read, bytes_to_read;
+	size_t bytes_read;
 	
 	oocd_trace->tty_fd = open(oocd_trace->tty, O_RDWR | O_NOCTTY | O_NONBLOCK);
 
 	if(oocd_trace->tty_fd < 0)
 	{
-		ERROR("can't open tty");
+		LOG_ERROR("can't open tty");
 		return ERROR_ETM_CAPTURE_INIT_FAILED;
 	}
 
@@ -142,7 +143,7 @@ int oocd_trace_init(etm_context_t *etm_ctx)
 	 * read up any leftover characters to ensure communication is in sync */
 	while ((bytes_read = read(oocd_trace->tty_fd, trash, sizeof(trash))) > 0)
 	{
-	    DEBUG("%i bytes read\n", bytes_read);
+	    LOG_DEBUG("%i bytes read\n", bytes_read);
 	};
 	
 	return ERROR_OK;
@@ -247,7 +248,7 @@ int oocd_trace_start_capture(etm_context_t *etm_ctx)
 	if (((etm_ctx->portmode & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL)
 		|| ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT))
 	{
-		DEBUG("OpenOCD+trace only supports normal 4-bit ETM mode");
+		LOG_DEBUG("OpenOCD+trace only supports normal 4-bit ETM mode");
 		return ERROR_ETM_PORTMODE_NOT_SUPPORTED;
 	}
 	
@@ -302,7 +303,7 @@ int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, char *cm
 	
 	if (argc != 2)
 	{
-		ERROR("incomplete 'oocd_trace config <target> <tty>' command");
+		LOG_ERROR("incomplete 'oocd_trace config <target> <tty>' command");
 		exit(-1);
 	}
 	
@@ -326,7 +327,7 @@ int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, char *cm
 	}
 	else
 	{
-		ERROR("target has no ETM defined, OpenOCD+trace left unconfigured");
+		LOG_ERROR("target has no ETM defined, OpenOCD+trace left unconfigured");
 	}
 
 	return ERROR_OK;
@@ -378,7 +379,6 @@ int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, char *cm
 	armv4_5_common_t *armv4_5;
 	arm7_9_common_t *arm7_9;
 	oocd_trace_t *oocd_trace;
-	u32 status;
 	size_t bytes_written;
 	u8 cmd_array[1];
 	
@@ -409,7 +409,7 @@ int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, char *cm
 	bytes_written = write(oocd_trace->tty_fd, cmd_array, 1);
 	
 	command_print(cmd_ctx, "requesting traceclock resync");
-	DEBUG("resyncing traceclk pll");
+	LOG_DEBUG("resyncing traceclk pll");
 
 	return ERROR_OK;
 }