- image.c and fileio.c now uses logging to propagate error strings.

More precise, less code.
- removed unused code in fileio.c
- Windows should now find debug_handler.bin

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

src/flash/ecos.c

@@ -196,7 +196,6 @@ int loadDriver(ecosflash_flash_bank_t *info)
 	
 	if (image_open(&image, info->driverPath, NULL) != ERROR_OK)
 	{
-		ERROR("load_image error: %s", image.error_str);
 		return ERROR_FLASH_BANK_INVALID;
 	}
 	

src/flash/flash.c

@@ -605,7 +605,6 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
 	retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL);
 	if (retval != ERROR_OK)
 	{
-		command_print(cmd_ctx, "image_open error: %s", image.error_str);
 		return retval;
 	}
 
@@ -662,14 +661,12 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd
 
 	if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "flash write_binary error: %s", fileio.error_str);
 		return ERROR_OK;
 	}
 
 	buffer = malloc(fileio.size);
 	if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "flash write_binary error: %s", fileio.error_str);
 		return ERROR_OK;
 	}
 

src/flash/nand.c

@@ -1271,7 +1271,6 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 		if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 		{
-			command_print(cmd_ctx, "file open error: %s", fileio.error_str);
 			return ERROR_OK;
 		}
 	
@@ -1411,7 +1410,6 @@ int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char
 			
 			if (fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
 			{
-				command_print(cmd_ctx, "dump_image error: %s", fileio.error_str);
 				return ERROR_OK;
 			}
 	

src/helper/fileio.c

@@ -24,6 +24,7 @@
 #include "types.h"
 #include "replacements.h"
 #include "log.h"
+#include "configuration.h"
 
 #include "fileio.h"
 
@@ -41,7 +42,6 @@ int fileio_dispatch_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
 
 int fileio_open_local(fileio_t *fileio)
 {
-	fileio_local_t *fileio_local = malloc(sizeof(fileio_local_t));
 	char access[4];
 	
 	switch (fileio->access)
@@ -62,7 +62,6 @@ int fileio_open_local(fileio_t *fileio)
 			strcpy(access, "a+");	
 			break;
 		default:
-			free(fileio_local);
 			ERROR("BUG: access neither read, write nor readwrite");
 			return ERROR_INVALID_ARGUMENTS;
 	}
@@ -75,10 +74,9 @@ int fileio_open_local(fileio_t *fileio)
 		strcat(access, "b");
 	}
 	
-	if (!(fileio_local->file = fopen(fileio->url, access)))
+	if (!(fileio->file = open_file_from_path (fileio->url, access)))
 	{
-		free(fileio_local);
+		ERROR("couldn't open %s", fileio->url);
-		snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't open %s", fileio->url);
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 	
@@ -89,11 +87,11 @@ int fileio_open_local(fileio_t *fileio)
 		 * that refers to e.g. a tftp client */
 		int result, result2;
 		
-		result = fseek(fileio_local->file, 0, SEEK_END);
+		result = fseek(fileio->file, 0, SEEK_END);
 
-		fileio->size = ftell(fileio_local->file);
+		fileio->size = ftell(fileio->file);
 		
-		result2 = fseek(fileio_local->file, 0, SEEK_SET); 
+		result2 = fseek(fileio->file, 0, SEEK_SET); 
 			
 		if ((fileio->size<0)||(result<0)||(result2<0))
 		{
@@ -106,78 +104,39 @@ int fileio_open_local(fileio_t *fileio)
 		fileio->size = 0x0;
 	}
 	
-	fileio->location_private = fileio_local;
-	
 	return ERROR_OK;
 }
 
 int fileio_open(fileio_t *fileio, char *url, enum fileio_access access,	enum fileio_type type)
 {
 	int retval = ERROR_OK;
-	char *resource_identifier = NULL;
-
-	/* try to identify file location. We only hijack the file paths we understand, the rest is
-	 * passed on to the OS which might implement e.g. tftp via a mounted tftp device.
-	 */
-	if ((resource_identifier = strstr(url, "bootp://")) && (resource_identifier == url))
-	{
-		ERROR("bootp resource location isn't supported yet");
-		return ERROR_FILEIO_RESOURCE_TYPE_UNKNOWN;
-	}
-	else
-	{
-		/* default to local files */
-		fileio->location = FILEIO_LOCAL;
-	}
 
 	fileio->type = type;
 	fileio->access = access;
 	fileio->url = strdup(url);
 	
-	switch (fileio->location)
-	{
-		case FILEIO_LOCAL:
 	retval = fileio_open_local(fileio);
-			break;
-		default:
-			ERROR("BUG: should never get here");
-			exit(-1);
-	}
 
-	if (retval != ERROR_OK)
 	return retval;
-	
-	return ERROR_OK;
 }
 
 int fileio_close_local(fileio_t *fileio)
 {
 	int retval;
-	fileio_local_t *fileio_local = fileio->location_private;
+	if ((retval = fclose(fileio->file)) != 0)
-	
-	if (fileio->location_private == NULL)
-	{
-		snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't close %s: ", fileio->url);
-		return ERROR_FILEIO_OPERATION_FAILED;
-	}
-	
-	if ((retval = fclose(fileio_local->file)) != 0)
 	{
 		if (retval == EBADF)
 		{
-			snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "BUG: fileio_local->file not a valid file descriptor");
+			ERROR("BUG: fileio_local->file not a valid file descriptor");
 		}
 		else
 		{
-			snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't close %s: %s", fileio->url, strerror(errno));
+			ERROR("couldn't close %s: %s", fileio->url, strerror(errno));
 		}
 
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 	
-	free(fileio->location_private);
-	fileio->location_private = NULL;
-	
 	return ERROR_OK;
 }
 
@@ -185,48 +144,21 @@ int fileio_close(fileio_t *fileio)
 {
 	int retval;
 	
-	switch (fileio->location)
-	{
-		case FILEIO_LOCAL:
 	retval = fileio_close_local(fileio);
-			break;
-		default:
-			ERROR("BUG: should never get here");
-			retval = ERROR_FILEIO_OPERATION_FAILED;
-	}
-	
-	if (retval != ERROR_OK)
-		return retval;
 	
 	free(fileio->url);
 	fileio->url = NULL;
 	
-	return ERROR_OK;
+	return retval;
-}
-
-int fileio_seek_local(fileio_t *fileio, u32 position)
-{
-	int retval;
-	fileio_local_t *fileio_local = fileio->location_private;
-	
-	if ((retval = fseek(fileio_local->file, position, SEEK_SET)) != 0)
-	{
-		snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't seek file %s: %s", fileio->url, strerror(errno));
-		return ERROR_FILEIO_OPERATION_FAILED;
-	}
-	
-	return ERROR_OK;
 }
 
 int fileio_seek(fileio_t *fileio, u32 position)
 {
-	switch (fileio->location)
+	int retval;
+	if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0)
 	{
-		case FILEIO_LOCAL:
+		ERROR("couldn't seek file %s: %s", fileio->url, strerror(errno));
-			return fileio_seek_local(fileio, position);
+		return ERROR_FILEIO_OPERATION_FAILED;
-			break;
-		default:
-			ERROR("BUG: should never get here");
 	}
 	
 	return ERROR_OK;
@@ -234,24 +166,14 @@ int fileio_seek(fileio_t *fileio, u32 position)
 
 int fileio_local_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
 {
-	fileio_local_t *fileio_local = fileio->location_private;
+	*size_read = fread(buffer, 1, size, fileio->file);
-	
-	*size_read = fread(buffer, 1, size, fileio_local->file);
 	
 	return ERROR_OK;
 }
 
 int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
 {
-	switch (fileio->location)
-	{
-		case FILEIO_LOCAL:
 	return fileio_local_read(fileio, size, buffer, size_read);
-			break;
-		default:
-			ERROR("BUG: should never get here");
-			exit(-1);
-	}
 }
 
 int fileio_read_u32(fileio_t *fileio, u32 *data)
@@ -260,26 +182,16 @@ int fileio_read_u32(fileio_t *fileio, u32 *data)
 	u32 size_read;
 	int retval;
 	
-	switch (fileio->location)
-	{
-		case FILEIO_LOCAL:
 	if ((retval = fileio_local_read(fileio, 4, buf, &size_read)) != ERROR_OK)
 		return retval;
 	*data = be_to_h_u32(buf);
-			break;
-		default:
-			ERROR("BUG: should never get here");
-			exit(-1);
-	}
 	
 	return ERROR_OK;
 }
 
 int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
 {
-	fileio_local_t *fileio_local = fileio->location_private;
+	if( fgets(buffer, size, fileio->file) == NULL)
-	
-	if( fgets(buffer, size, fileio_local->file) == NULL)
 		return ERROR_FILEIO_OPERATION_FAILED;
 	
 	return ERROR_OK;
@@ -287,22 +199,12 @@ int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
 
 int fileio_fgets(fileio_t *fileio, u32 size, u8 *buffer)
 {
-	switch (fileio->location)
-	{
-		case FILEIO_LOCAL:
 	return fileio_local_fgets(fileio, size, buffer);
-			break;
-		default:
-			ERROR("BUG: should never get here");
-			exit(-1);
-	}
 }
 
 int fileio_local_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
 {
-	fileio_local_t *fileio_local = fileio->location_private;
+	*size_written = fwrite(buffer, 1, size, fileio->file);
-	
-	*size_written = fwrite(buffer, 1, size, fileio_local->file);
 	
 	return ERROR_OK;
 }
@@ -311,15 +213,7 @@ int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
 {
 	int retval;
 	
-	switch (fileio->location)
-	{
-		case FILEIO_LOCAL:
 	retval = fileio_local_write(fileio, size, buffer, size_written);
-			break;
-		default:
-			ERROR("BUG: should never get here");
-			exit(-1);
-	}
 	
 	if (retval == ERROR_OK)
 		fileio->size += *size_written;
@@ -335,15 +229,8 @@ int fileio_write_u32(fileio_t *fileio, u32 data)
 	
 	h_u32_to_be(buf, data);
 	
-	switch (fileio->location)
-	{
-		case FILEIO_LOCAL:
 	if ((retval = fileio_local_write(fileio, 4, buf, &size_written)) != ERROR_OK)
 		return retval;
-			break;
-		default:
-			ERROR("BUG: should never get here");
-	}
 	
 	return ERROR_OK;
 }

src/helper/fileio.h

@@ -38,18 +38,6 @@ enum fileio_type
 	FILEIO_BINARY,
 };
 
-enum fileio_location
-{
-	FILEIO_LOCAL,
-/*
- * Possible future enhancements:
- * FILEIO_NFS,
- * FILEIO_BOOTP,
- * FILEIO_[XYZ]MODEM,
- * FILEIO_HTTP,
- * FILEIO_FTP,
- */
-};
 
 enum fileio_access
 {
@@ -63,18 +51,11 @@ enum fileio_access
 typedef struct fileio_s
 {
 	char *url;
-	char error_str[FILEIO_MAX_ERROR_STRING];
 	long long size;
 	enum fileio_type type;
-	enum fileio_location location;
 	enum fileio_access access;
-	void *location_private;
-} fileio_t;
-
-typedef struct fileio_local_s
-{
 	FILE *file;
-} fileio_local_t;
+} fileio_t;
 
 extern int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written);
 extern int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read);

src/target/arm7_9_common.c

@@ -764,7 +764,6 @@ int arm7_9_assert_reset(target_t *target)
 		{
 			if (retval == ERROR_JTAG_RESET_WOULD_ASSERT_TRST)
 			{
-				WARNING("srst resets test logic, too");
 				retval = jtag_add_reset(1, 1);
 			}
 		}
@@ -775,7 +774,6 @@ int arm7_9_assert_reset(target_t *target)
 		{
 			if (retval == ERROR_JTAG_RESET_WOULD_ASSERT_TRST)
 			{
-				WARNING("srst resets test logic, too");
 				retval = jtag_add_reset(1, 1);
 			}
 			

src/target/etm.c

@@ -1387,6 +1387,9 @@ int handle_etm_info_command(struct command_context_s *cmd_ctx, char *cmd, char *
 		case 2:
 			max_port_size = 16;
 			break;
+		default:
+			ERROR("Illegal max_port_size");
+			exit(-1);
 	}
 	command_print(cmd_ctx, "max. port size: %i", max_port_size);
 	
@@ -1505,7 +1508,6 @@ int handle_etm_image_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 	if (image_open(etm_ctx->image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "image opening error: %s", etm_ctx->image->error_str);
 		free(etm_ctx->image);
 		etm_ctx->image = NULL;
 		return ERROR_OK;
@@ -1562,7 +1564,6 @@ int handle_etm_dump_command(struct command_context_s *cmd_ctx, char *cmd, char *
 	
 	if (fileio_open(&file, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "file open error: %s", file.error_str);
 		return ERROR_OK;
 	}
 	
@@ -1620,7 +1621,6 @@ int handle_etm_load_command(struct command_context_s *cmd_ctx, char *cmd, char *
 	
 	if (fileio_open(&file, args[0], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "file open error: %s", file.error_str);
 		return ERROR_OK;
 	}
 	

src/target/image.c

@@ -55,20 +55,14 @@ static int autodetect_image_type(image_t *image, char *url)
 	/* read the first 4 bytes of image */
 	if ((retval = fileio_open(&fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
 	{
-		snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, "cannot open image: %s", fileio.error_str);
-		ERROR(image->error_str);
 		return retval;
 	}
 	if ((retval = fileio_read(&fileio, 9, buffer, &read_bytes)) != ERROR_OK)
 	{
-		snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, "cannot read image header: %s", fileio.error_str);
-		ERROR(image->error_str);
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 	if (read_bytes != 9)
 	{
-		snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, "cannot read image, only partially read");
-		ERROR(image->error_str);
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 	fileio_close(&fileio);
@@ -552,6 +546,7 @@ int image_mot_buffer_complete(image_t *image)
 					bytes_read += 8;
 					count -=4;
 					break;
+			
 			}
 			
 			if (full_address != address)
@@ -650,8 +645,6 @@ int image_open(image_t *image, char *url, char *type_string)
 		
 		if ((retval = fileio_open(&image_binary->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
 		{
-			strncpy(image->error_str, image_binary->fileio.error_str, IMAGE_MAX_ERROR_STRING);
-			ERROR(image->error_str);
 			return retval;
 		}
 		
@@ -669,16 +662,12 @@ int image_open(image_t *image, char *url, char *type_string)
 		
 		if ((retval = fileio_open(&image_ihex->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK)
 		{
-			strncpy(image->error_str, image_ihex->fileio.error_str, IMAGE_MAX_ERROR_STRING);
-			ERROR(image->error_str);
 			return retval;
 		}
 		
 		if ((retval = image_ihex_buffer_complete(image)) != ERROR_OK)
 		{
-			snprintf(image->error_str, IMAGE_MAX_ERROR_STRING,
+			ERROR("failed buffering IHEX image, check daemon output for additional information");
-				"failed buffering IHEX image, check daemon output for additional information");
-			ERROR(image->error_str);
 			fileio_close(&image_ihex->fileio);
 			return retval;
 		}
@@ -691,16 +680,11 @@ int image_open(image_t *image, char *url, char *type_string)
 		
 		if ((retval = fileio_open(&image_elf->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
 		{
-			strncpy(image->error_str, image_elf->fileio.error_str, IMAGE_MAX_ERROR_STRING);
-			ERROR(image->error_str);
 			return retval;
 		}
 		
 		if ((retval = image_elf_read_headers(image)) != ERROR_OK)
 		{
-			snprintf(image->error_str, IMAGE_MAX_ERROR_STRING,
-				"failed to read ELF headers, check daemon output for additional information");
-			ERROR(image->error_str);
 			fileio_close(&image_elf->fileio);
 			return retval;
 		}
@@ -729,16 +713,12 @@ int image_open(image_t *image, char *url, char *type_string)
 		
 		if ((retval = fileio_open(&image_mot->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK)
 		{
-			strncpy(image->error_str, image_mot->fileio.error_str, IMAGE_MAX_ERROR_STRING);
-			ERROR(image->error_str);
 			return retval;
 		}
 		
 		if ((retval = image_mot_buffer_complete(image)) != ERROR_OK)
 		{
-			snprintf(image->error_str, IMAGE_MAX_ERROR_STRING,
+			ERROR("failed buffering S19 image, check daemon output for additional information");
-				"failed buffering S19 image, check daemon output for additional information");
-			ERROR(image->error_str);
 			fileio_close(&image_mot->fileio);
 			return retval;
 		}
@@ -791,14 +771,12 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
 		/* seek to offset */
 		if ((retval = fileio_seek(&image_binary->fileio, offset)) != ERROR_OK)
 		{
-			strncpy(image->error_str, image_binary->fileio.error_str, IMAGE_MAX_ERROR_STRING);
 			return retval;
 		}
 		
 		/* return requested bytes */
 		if ((retval = fileio_read(&image_binary->fileio, size, buffer, size_read)) != ERROR_OK)
 		{
-			strncpy(image->error_str, image_binary->fileio.error_str, IMAGE_MAX_ERROR_STRING);
 			return retval;
 		}
 	}
@@ -806,7 +784,6 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
 	{
 		memcpy(buffer, (u8*)image->sections[section].private + offset, size);
 		*size_read = size;
-		image->error_str[0] = '\0';
 		
 		return ERROR_OK;
 	}
@@ -857,7 +834,6 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
 	{
 		memcpy(buffer, (u8*)image->sections[section].private + offset, size);
 		*size_read = size;
-		image->error_str[0] = '\0';
 		
 		return ERROR_OK;
 	}
@@ -865,7 +841,6 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
 	{
 		memcpy(buffer, (u8*)image->sections[section].private + offset, size);
 		*size_read = size;
-		image->error_str[0] = '\0';
 		
 		return ERROR_OK;
 	}
@@ -1026,5 +1001,3 @@ int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum)
 	return ERROR_OK;
 }
 
-
-

src/target/image.h

@@ -64,7 +64,6 @@ typedef struct image_s
 	int base_address;		/* base address, if one is set */
 	int start_address_set;	/* whether the image has a start address (entry point) associated */
 	u32 start_address;		/* start address, if one is set */
-	char error_str[IMAGE_MAX_ERROR_STRING];
 } image_t;
 
 typedef struct image_binary_s

src/target/xscale.c

@@ -1062,6 +1062,7 @@ int xscale_poll(target_t *target)
 		else
 			target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
 	}
+
 	return retval;
 }
 
@@ -1657,9 +1658,8 @@ int xscale_deassert_reset(target_t *target)
 		xscale_write_dcsr(target, 1, 0);
 
 		/* Load debug handler */
-		if (fileio_open(&debug_handler, PKGLIBDIR "/xscale/debug_handler.bin", FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
+		if (fileio_open(&debug_handler, "xscale/debug_handler.bin", FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 		{
-			ERROR("file open error: %s", debug_handler.error_str);
 			return ERROR_OK;
 		}
 
@@ -1685,7 +1685,7 @@ int xscale_deassert_reset(target_t *target)
 
 			if ((retval = fileio_read(&debug_handler, 32, buffer, &buf_cnt)) != ERROR_OK)
 			{
-				ERROR("reading debug handler failed: %s", debug_handler.error_str);
+				
 			}
 
 			for (i = 0; i < buf_cnt; i += 4)
@@ -3261,6 +3261,7 @@ static int xscale_virt2phys(struct target_s *target, u32 virtual, u32 *physical)
 	int domain;
 	u32 ap;
 	
+	
 	if ((retval = xscale_get_arch_pointers(target, &armv4_5, &xscale)) != ERROR_OK)
 	{
 		return retval;
@@ -3270,7 +3271,6 @@ static int xscale_virt2phys(struct target_s *target, u32 virtual, u32 *physical)
 	{
 		return ret;
 	}
-	
 	*physical = ret;
 	return ERROR_OK;
 }
@@ -3285,11 +3285,11 @@ static int xscale_mmu(struct target_s *target, int *enabled)
 		ERROR("Target not halted");
 		return ERROR_TARGET_INVALID;
 	}
-	
 	*enabled = xscale->armv4_5_mmu.mmu_enabled;
 	return ERROR_OK;
 }
 
+
 int xscale_handle_mmu_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc)
 {
 	target_t *target = get_current_target(cmd_ctx);
@@ -3558,7 +3558,6 @@ int xscale_handle_trace_image_command(struct command_context_s *cmd_ctx, char *c
 
 	if (image_open(xscale->trace.image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "image opening error: %s", xscale->trace.image->error_str);
 		free(xscale->trace.image);
 		xscale->trace.image = NULL;
 		return ERROR_OK;
@@ -3602,7 +3601,6 @@ int xscale_handle_dump_trace_command(struct command_context_s *cmd_ctx, char *cm
 
 	if (fileio_open(&file, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "file open error: %s", file.error_str);
 		return ERROR_OK;
 	}
 
@@ -3793,6 +3791,7 @@ int xscale_register_commands(struct command_context_s *cmd_ctx)
 	register_command(cmd_ctx, xscale_cmd, "fast_memory_access", handle_xscale_fast_memory_access_command,
 		 COMMAND_ANY, "use fast memory accesses instead of slower but potentially unsafe slow accesses <enable|disable>");
 
+	
 	armv4_5_register_commands(cmd_ctx);
 
 	return ERROR_OK;