Remove duplicate check for flash write status.
Via code review by Steve Grubb <[email protected]>
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.
---
src/flash/flash.c | 40 +++++++++++++++++++---------------------
1 file changed, 19 insertions(+), 21 deletions(-)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -708,15 +708,16 @@ static int handle_flash_write_image_comm
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 @@ static int handle_flash_fill_command(str
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;
}
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
