- reworked image handling to support multiple sections (tested with ihex file containing gaps)

This checkin is still experimental, not recommended for general use



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

2 files changed, 64 insertions, 73 deletions

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 6af29825..58a467d2 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -490,9 +490,10 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c
 int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
 	u32 offset;
-	u32 binary_size;
 	u8 *buffer;
 	u32 buf_cnt;
+	u32 image_size;
+	int i;
 
 	image_t image;
 	
@@ -531,51 +532,62 @@ int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		return ERROR_OK;
 	}
 	
-	binary_size = image.size;
-	buffer = malloc(binary_size);
-
-	image_read(&image, binary_size, buffer, &buf_cnt);
-	
-	if ((retval = p->driver->write(p, buffer, offset, buf_cnt)) != ERROR_OK)
+	image_size = 0x0;
+	for (i = 0; i < image.num_sections; i++)
 	{
-		command_print(cmd_ctx, "failed writing file %s to flash bank %i at offset 0x%8.8x",
-			args[1], strtoul(args[0], NULL, 0), strtoul(args[2], NULL, 0));
-		switch (retval)
+		buffer = malloc(image.sections[i].size);
+		if ((retval = image_read_section(&image, i, 0x0, image.sections[i].size, buffer, &buf_cnt)) != ERROR_OK)
 		{
-			case ERROR_TARGET_NOT_HALTED:
-				command_print(cmd_ctx, "can't work with this flash while target is running");
-				break;
-			case ERROR_INVALID_ARGUMENTS:
-				command_print(cmd_ctx, "usage: flash write <bank> <file> <offset>");
-				break;
-			case ERROR_FLASH_BANK_INVALID:
-				command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base);
-				break;
-			case ERROR_FLASH_OPERATION_FAILED:
-				command_print(cmd_ctx, "flash program error");
-				break;
-			case ERROR_FLASH_DST_BREAKS_ALIGNMENT:
-				command_print(cmd_ctx, "offset breaks required alignment");
-				break;
-			case ERROR_FLASH_DST_OUT_OF_BANK:
-				command_print(cmd_ctx, "destination is out of flash bank (offset and/or file too large)");
-				break;
-			case ERROR_FLASH_SECTOR_NOT_ERASED:
-				command_print(cmd_ctx, "destination sector(s) not erased");
-				break;
-			default:
-				command_print(cmd_ctx, "unknown error");
+			ERROR("image_read_section failed with error code: %i", retval);
+			command_print(cmd_ctx, "image reading failed, flash write aborted");
+			free(buffer);
+			image_close(&image);
+			return ERROR_OK;
 		}
+		
+		if ((retval = p->driver->write(p, buffer, offset, buf_cnt)) != ERROR_OK)
+		{
+			command_print(cmd_ctx, "failed writing file %s to flash bank %i at offset 0x%8.8x",
+				args[1], strtoul(args[0], NULL, 0), strtoul(args[2], NULL, 0));
+			switch (retval)
+			{
+				case ERROR_TARGET_NOT_HALTED:
+					command_print(cmd_ctx, "can't work with this flash while target is running");
+					break;
+				case ERROR_INVALID_ARGUMENTS:
+					command_print(cmd_ctx, "usage: flash write <bank> <file> <offset>");
+					break;
+				case ERROR_FLASH_BANK_INVALID:
+					command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base);
+					break;
+				case ERROR_FLASH_OPERATION_FAILED:
+					command_print(cmd_ctx, "flash program error");
+					break;
+				case ERROR_FLASH_DST_BREAKS_ALIGNMENT:
+					command_print(cmd_ctx, "offset breaks required alignment");
+					break;
+				case ERROR_FLASH_DST_OUT_OF_BANK:
+					command_print(cmd_ctx, "destination is out of flash bank (offset and/or file too large)");
+					break;
+				case ERROR_FLASH_SECTOR_NOT_ERASED:
+					command_print(cmd_ctx, "destination sector(s) not erased");
+					break;
+				default:
+					command_print(cmd_ctx, "unknown error");
+			}
+		}
+		image_size += buf_cnt;
+
+		free(buffer);
 	}
-	else
-	{
-		duration_stop_measure(&duration, &duration_text);
-		command_print(cmd_ctx, "wrote file %s to flash bank %i at offset 0x%8.8x in %s",
-			args[1], strtoul(args[0], NULL, 0), offset, duration_text);
-		free(duration_text);
-	}
+
 	
-	free(buffer);
+	duration_stop_measure(&duration, &duration_text);
+	command_print(cmd_ctx, "wrote %u byte from file %s to flash bank %i at offset 0x%8.8x in %s (%f kb/s)",
+		image_size, args[1], strtoul(args[0], NULL, 0), offset, duration_text,
+		(float)image_size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
+	free(duration_text);
+
 	image_close(&image);
 	
 	return ERROR_OK;
diff --git a/src/flash/nand.c b/src/flash/nand.c
index 38a70749..7ff73512 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -1164,8 +1164,7 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 	u32 buf_cnt;
 	enum oob_formats oob_format = NAND_OOB_NONE;
 	
-	image_t image;
-	int image_type_identified = 0;
+	fileio_t fileio;
 	
 	duration_t duration;
 	char *duration_text;
@@ -1187,7 +1186,7 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 		u32 oob_size = 0;
 			
 		duration_start_measure(&duration);
-		strtoul(args[2], NULL, 0);
+		offset = strtoul(args[2], NULL, 0);
 		
 		if (argc > 3)
 		{
@@ -1200,40 +1199,18 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 					oob_format |= NAND_OOB_RAW | NAND_OOB_ONLY;
 				else
 				{
-					if (identify_image_type(&image.type, args[i]) == ERROR_OK)
-					{
-						image_type_identified = 1;
-					}
-					else
-					{
-						command_print(cmd_ctx, "unknown option: %s", args[i]);
-					}
+					command_print(cmd_ctx, "unknown option: %s", args[i]);
 				}
 			}
 		}
 		
-		/* if no image type option was encountered, set the default */
-		if (!image_type_identified)
-		{
-			
-			identify_image_type(&image.type, NULL);
-			image_type_identified = 1;
-		}
-
-		image.base_address_set = 1;
-		image.base_address = strtoul(args[2], NULL, 0);
-		image.start_address_set = 0;
-	
-		if (image_open(&image, args[1], FILEIO_READ) != ERROR_OK)
+		if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 		{
-			command_print(cmd_ctx, "flash write error: %s", image.error_str);
+			command_print(cmd_ctx, "file open error: %s", fileio.error_str);
 			return ERROR_OK;
 		}
 	
-		/* the offset might have been overwritten by the image base address */
-		offset = image.base_address;
-		
-		buf_cnt = binary_size = image.size;
+		buf_cnt = binary_size = fileio.size;
 		
 		if (!(oob_format & NAND_OOB_ONLY))
 		{
@@ -1262,7 +1239,7 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 			
 			if (page)
 			{
-				image_read(&image, page_size, page, &size_read);
+				fileio_read(&fileio, page_size, page, &size_read);
 				buf_cnt -= size_read;
 				if (size_read < page_size)
 				{
@@ -1272,7 +1249,7 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 				
 			if (oob)
 			{
-				image_read(&image, oob_size, oob, &size_read);
+				fileio_read(&fileio, oob_size, oob, &size_read);
 				buf_cnt -= size_read;
 				if (size_read < oob_size)
 				{
@@ -1289,9 +1266,11 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 			offset += page_size;
 		}
 
+		fileio_close(&fileio);
+		
 		duration_stop_measure(&duration, &duration_text);
 		command_print(cmd_ctx, "wrote file %s to NAND flash %s at offset 0x%8.8x in %s",
-			args[1], args[0], image.base_address, duration_text);
+			args[1], args[0], offset, duration_text);
 		free(duration_text);
 	}
 	else