From 98ae6c24f031c559fd95af3fd30dac2d04b3ec51 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sun, 30 Aug 2009 20:04:17 +0000
Subject: [PATCH] =?UTF-8?q?David=20Brownell=20<david-b@pacbell.net>=20Remo?=
=?UTF-8?q?ve=20duplicate=20check=20for=20flash=20write=20status.=20Via=20?=
=?UTF-8?q?code=20review=20by=20Steve=20Grubb=20<sgrubb@redhat.com>=C2=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
git-svn-id: svn://svn.berlios.de/openocd/trunk@2652 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/flash/flash.c | 40 +++++++++++++++++++---------------------
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/flash/flash.c b/src/flash/flash.c
index c386579d0..ce1dc4fe1 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -708,15 +708,16 @@ static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, c
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(struct command_context_s *cmd_ctx, char *cm
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;
}
--
GitLab