[Openocd-svn] r1399 - trunk/src/flash

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-03-05 08:41:04 +0100 (Thu, 05 Mar 2009)
New Revision: 1399

Modified:
   trunk/src/flash/flash.c
Log:
Audrius Urmanavi?\196?\141ius <did...@gm...>  cleanup flash fill

Modified: trunk/src/flash/flash.c
===================================================================
--- trunk/src/flash/flash.c	2009-03-05 06:55:35 UTC (rev 1398)
+++ trunk/src/flash/flash.c	2009-03-05 07:41:04 UTC (rev 1399)
@@ -727,6 +727,7 @@
 	u32 count;
 	u8 chunk[1024];
 	u32 wrote = 0;
+	u32 cur_size = 0;
 	int chunk_count;
 	char *duration_text;
 	duration_t duration;
@@ -786,9 +787,9 @@
 
 	duration_start_measure(&duration);
 
-	for (wrote=0; wrote<(count*wordsize); wrote+=sizeof(chunk))
+	for (wrote=0; wrote<(count*wordsize); wrote += cur_size)
 	{
-		int cur_size = MIN( (count*wordsize - wrote) , 1024 );
+		cur_size = MIN( (count*wordsize - wrote), sizeof(chunk) );
 		flash_bank_t *bank;
 		bank = get_flash_bank_by_addr(target, address);
 		if(bank == NULL)
@@ -798,7 +799,6 @@
 		err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size);
 		if (err!=ERROR_OK)
 			return err;
-		wrote += cur_size;
 	}
 
 	if ((retval = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)