From 219b7f30b99c8af9f94fa1b10537bb0e2dc6209f Mon Sep 17 00:00:00 2001 From: oharboe Date: Fri, 29 Feb 2008 11:42:37 +0000 Subject: - 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 | 1 - src/flash/flash.c | 3 --- src/flash/nand.c | 2 -- 3 files changed, 6 deletions(-) (limited to 'src/flash') diff --git a/src/flash/ecos.c b/src/flash/ecos.c index 5994660c..57c760fd 100644 --- a/src/flash/ecos.c +++ b/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; } diff --git a/src/flash/flash.c b/src/flash/flash.c index d61ecf20..db4449d5 100644 --- a/src/flash/flash.c +++ b/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; } diff --git a/src/flash/nand.c b/src/flash/nand.c index 8ce7cf0a..d0e1d8df 100644 --- a/src/flash/nand.c +++ b/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; } -- cgit v1.2.3