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

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

Author: oharboe
Date: 2009-08-30 22:04:17 +0200 (Sun, 30 Aug 2009)
New Revision: 2652

Modified:
   trunk/src/flash/flash.c
Log:
David Brownell <da...@pa...> Remove duplicate check for flash write status.
Via code review by Steve Grubb <sg...@re...>?\194?\160

Also minor fixes for the message from "fill":  the byte
count is unsigned, not signed; and more importantly,
print the real number of bytes written

Modified: trunk/src/flash/flash.c
===================================================================
--- trunk/src/flash/flash.c	2009-08-30 17:32:56 UTC (rev 2651)
+++ trunk/src/flash/flash.c	2009-08-30 20:04:17 UTC (rev 2652)
@@ -708,15 +708,16 @@
 		image_close(&image);
 		return retvaltemp;
 	}
-	if (retval == ERROR_OK)
-	{
-		command_print(cmd_ctx,
-					  "wrote %" PRIu32 " byte from file %s in %s (%f kb/s)",
-					  written,
-					  args[0],
-					  duration_text,
-					  (float)written / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
-	}
+
+	float speed;
+
+	speed = written / 1024.0;
+	speed /= ((float)duration.duration.tv_sec
+			+ ((float)duration.duration.tv_usec / 1000000.0));
+	command_print(cmd_ctx,
+			"wrote %" PRIu32 " byte from file %s in %s (%f kb/s)",
+			written, args[0], duration_text, speed);
+
 	free(duration_text);
 
 	image_close(&image);
@@ -828,18 +829,15 @@
 		return retval;
 	}
 
-	if (err == ERROR_OK)
-	{
-		float speed;
-		speed = wrote / 1024.0;
-		speed/=((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0));
-		command_print(cmd_ctx,
-					  "wrote %" PRId32 " bytes to 0x%8.8" PRIx32 " in %s (%f kb/s)",
-					  count*wordsize,
-					  address,
-					  duration_text,
-					  speed);
-	}
+	float speed;
+
+	speed = wrote / 1024.0;
+	speed /= ((float)duration.duration.tv_sec
+			+ ((float)duration.duration.tv_usec / 1000000.0));
+	command_print(cmd_ctx,
+			"wrote %" PRIu32 " bytes to 0x%8.8" PRIx32 " in %s (%f kb/s)",
+			wrote, address, duration_text, speed);
+
 	free(duration_text);
 	return ERROR_OK;
 }