diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-08-30 20:04:17 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-08-30 20:04:17 +0000 |
| commit | 98ae6c24f031c559fd95af3fd30dac2d04b3ec51 (patch) | |
| tree | 91bd0e1b6c92c86c4beff06ea594226d2be6bae0 /src/flash | |
| parent | ab30d5203c241df23b2df7f973a8c2177f436983 (diff) | |
| download | openocd+libswd-98ae6c24f031c559fd95af3fd30dac2d04b3ec51.tar.gz openocd+libswd-98ae6c24f031c559fd95af3fd30dac2d04b3ec51.tar.bz2 openocd+libswd-98ae6c24f031c559fd95af3fd30dac2d04b3ec51.tar.xz openocd+libswd-98ae6c24f031c559fd95af3fd30dac2d04b3ec51.zip | |
David Brownell <david-b@pacbell.net> Remove duplicate check for flash write status.
Via code review by Steve Grubb <sgrubb@redhat.com>
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
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/flash.c | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/src/flash/flash.c b/src/flash/flash.c index c386579d..ce1dc4fe 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; } |