From 570631454df083f2af26e453939424a14a9684f1 Mon Sep 17 00:00:00 2001 From: zwelch Date: Thu, 21 May 2009 09:28:57 +0000 Subject: David Brownell : This patch adds annotations to the key command_*() helper functions, fixng the bugs that turned up. Several of these bugs were from misuse of PRIi64; that's for 64-bit integers, NOT for "long long" or "u64" (which work best with %lld). git-svn-id: svn://svn.berlios.de/openocd/trunk@1873 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/flash.c | 11 +++++++---- src/flash/nand.c | 10 +++++----- 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'src/flash') diff --git a/src/flash/flash.c b/src/flash/flash.c index ff66a396..9beec5a1 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -432,7 +432,7 @@ static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, c int j; if ((retval = p->driver->erase_check(p)) == ERROR_OK) { - command_print(cmd_ctx, "successfully checked erase state", p->driver->name, p->base); + command_print(cmd_ctx, "successfully checked erase state"); } else { @@ -567,7 +567,8 @@ static int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *c return retval; } - command_print(cmd_ctx, "erased sectors %i through %i on flash bank %i in %s", first, last, strtoul(args[0], 0, 0), duration_text); + command_print(cmd_ctx, "erased sectors %i through %i on flash bank %li in %s", + first, last, strtoul(args[0], 0, 0), duration_text); free(duration_text); } } @@ -606,7 +607,9 @@ static int handle_flash_protect_command(struct command_context_s *cmd_ctx, char retval = flash_driver_protect(p, set, first, last); if (retval == ERROR_OK) { - command_print(cmd_ctx, "%s protection for sectors %i through %i on flash bank %i", (set) ? "set" : "cleared", first, last, strtoul(args[0], 0, 0)); + command_print(cmd_ctx, "%s protection for sectors %i through %i on flash bank %li", + (set) ? "set" : "cleared", first, + last, strtoul(args[0], 0, 0)); } } else @@ -873,7 +876,7 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch } if (retval==ERROR_OK) { - command_print(cmd_ctx, "wrote %"PRIi64" byte from file %s to flash bank %i at offset 0x%8.8x in %s (%f kb/s)", + command_print(cmd_ctx, "wrote %lld byte from file %s to flash bank %li at offset 0x%8.8x in %s (%f kb/s)", fileio.size, args[1], strtoul(args[0], NULL, 0), offset, duration_text, (float)fileio.size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0))); } diff --git a/src/flash/nand.c b/src/flash/nand.c index 85ca0fed..6ca008c7 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -1148,7 +1148,7 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd } else { - command_print(cmd_ctx, "#%i: not probed"); + command_print(cmd_ctx, "#%s: not probed", args[0]); } } @@ -1251,7 +1251,7 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char { if ((retval = nand_build_bbt(p, first, last)) == ERROR_OK) { - command_print(cmd_ctx, "checked NAND flash device for bad blocks, use \"nand info\" command to list blocks", p->device->name); + command_print(cmd_ctx, "checked NAND flash device for bad blocks, use \"nand info\" command to list blocks"); } else if (retval == ERROR_NAND_OPERATION_FAILED) { @@ -1570,13 +1570,13 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd fileio_close(&fileio); duration_stop_measure(&duration, &duration_text); - command_print(cmd_ctx, "dumped %"PRIi64" byte in %s", fileio.size, duration_text); + command_print(cmd_ctx, "dumped %lld byte in %s", fileio.size, duration_text); free(duration_text); duration_text = NULL; } else { - command_print(cmd_ctx, "#%i: not probed"); + command_print(cmd_ctx, "#%s: not probed", args[0]); } } else @@ -1621,7 +1621,7 @@ static int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, cha } else { - command_print(cmd_ctx, "#%i: not probed"); + command_print(cmd_ctx, "#%s: not probed", args[0]); } } else -- cgit v1.2.3