[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-248-g5fd1c2d

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  5fd1c2db9ad43cc893d6287549262f82e6932e90 (commit)
      from  76b81682eeea804518cf69c4d916ccc78c2f3093 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5fd1c2db9ad43cc893d6287549262f82e6932e90
Author: Jon Povey <jon...@ra...>
Date:   Thu May 13 12:20:20 2010 +0900

    Change kb/s to KiB/s in messages about kibibytes
    
    Change download rate messages about kibibytes from "kb/s" to "KiB/s" units.
    See: http://en.wikipedia.org/wiki/Data_rate_units
    
    Signed-off-by: Jon Povey <jon...@ra...>

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 86dbd67..1272bf6 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -309,7 +309,7 @@ COMMAND_HANDLER(handle_nand_write_command)
 	if (nand_fileio_finish(&s))
 	{
 		command_print(CMD_CTX, "wrote file %s to NAND flash %s up to "
-				"offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+				"offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
 				CMD_ARGV[1], CMD_ARGV[0], s.address, duration_elapsed(&s.bench),
 				duration_kbps(&s.bench, total_bytes));
 	}
@@ -369,7 +369,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 	if (nand_fileio_finish(&file) == ERROR_OK)
 	{
 		command_print(CMD_CTX, "verified file %s in NAND flash %s "
-				"up to offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+				"up to offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
 				CMD_ARGV[1], CMD_ARGV[0], dev.address, duration_elapsed(&file.bench),
 				duration_kbps(&file.bench, dev.size));
 	}
@@ -409,7 +409,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
 
 	if (nand_fileio_finish(&s) == ERROR_OK)
 	{
-		command_print(CMD_CTX, "dumped %ld bytes in %fs (%0.3f kb/s)", 
+		command_print(CMD_CTX, "dumped %ld bytes in %fs (%0.3f KiB/s)",
 				(long)s.fileio.size, duration_elapsed(&s.bench),
 				duration_kbps(&s.bench, s.fileio.size));
 	}
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index af655c6..80d9a27 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -263,7 +263,7 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		command_print(CMD_CTX, "erased address 0x%8.8x (length %i)"
-				" in %fs (%0.3f kb/s)", address, length,
+				" in %fs (%0.3f KiB/s)", address, length,
 				duration_elapsed(&bench), duration_kbps(&bench, length));
 	}
 
@@ -448,7 +448,7 @@ COMMAND_HANDLER(handle_flash_write_image_command)
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		command_print(CMD_CTX, "wrote %" PRIu32 " bytes from file %s "
-				"in %fs (%0.3f kb/s)", written, CMD_ARGV[0],
+				"in %fs (%0.3f KiB/s)", written, CMD_ARGV[0],
 				duration_elapsed(&bench), duration_kbps(&bench, written));
 	}
 
@@ -582,7 +582,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
 	if (duration_measure(&bench) == ERROR_OK)
 	{
 		command_print(CMD_CTX, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32
-				" in %fs (%0.3f kb/s)", wrote, address,
+				" in %fs (%0.3f KiB/s)", wrote, address,
 				duration_elapsed(&bench), duration_kbps(&bench, wrote));
 	}
 
@@ -634,7 +634,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		command_print(CMD_CTX, "wrote %ld bytes from file %s to flash bank %u"
-				" at offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+				" at offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
 				(long)fileio.size, CMD_ARGV[1], p->bank_number, offset,
 				duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
 	}
diff --git a/src/target/target.c b/src/target/target.c
index 37e515a..c8c1012 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2560,7 +2560,7 @@ COMMAND_HANDLER(handle_load_image_command)
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		command_print(CMD_CTX, "downloaded %" PRIu32 " bytes "
-				"in %fs (%0.3f kb/s)", image_size,
+				"in %fs (%0.3f KiB/s)", image_size,
 				duration_elapsed(&bench), duration_kbps(&bench, image_size));
 	}
 
@@ -2626,7 +2626,7 @@ COMMAND_HANDLER(handle_dump_image_command)
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		command_print(CMD_CTX,
-				"dumped %ld bytes in %fs (%0.3f kb/s)", (long)fileio.size,
+				"dumped %ld bytes in %fs (%0.3f KiB/s)", (long)fileio.size,
 				duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
 	}
 
@@ -2769,7 +2769,7 @@ done:
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		command_print(CMD_CTX, "verified %" PRIu32 " bytes "
-				"in %fs (%0.3f kb/s)", image_size,
+				"in %fs (%0.3f KiB/s)", image_size,
 				duration_elapsed(&bench), duration_kbps(&bench, image_size));
 	}
 
@@ -4949,7 +4949,7 @@ COMMAND_HANDLER(handle_fast_load_image_command)
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		command_print(CMD_CTX, "Loaded %" PRIu32 " bytes "
-				"in %fs (%0.3f kb/s)", image_size, 
+				"in %fs (%0.3f KiB/s)", image_size,
 				duration_elapsed(&bench), duration_kbps(&bench, image_size));
 
 		command_print(CMD_CTX,

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nand/tcl.c |    6 +++---
 src/flash/nor/tcl.c  |    8 ++++----
 src/target/target.c  |    8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository