zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some C99 format specifiers 

As exposed by arm-none-eabi build, fix the wrong modifiers.

Change-Id: Ia6ce7c5c1d40e95059525c3e5d81b752df2fea7c
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2122
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
__archive__
Paul Fertser 2014-04-28 15:05:02 +04:00 committed by Andreas Fritiofson
parent 66c6665288
commit b1a1a48b30
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/flash/nor/at91sam4l.c
View File

@ -35,7 +35,7 @@
#define SAM4L_NUM_SECTORS 16 #define SAM4L_NUM_SECTORS 16
/* Locations in memory map */ /* Locations in memory map */
#define SAM4L_FLASH 0x00000000 /* Flash region */ #define SAM4L_FLASH ((uint32_t)0x00000000) /* Flash region */
#define SAM4L_FLASH_USER 0x00800000 /* Flash user page region */ #define SAM4L_FLASH_USER 0x00800000 /* Flash user page region */
#define SAM4L_FLASHCALW 0x400A0000 /* Flash controller */ #define SAM4L_FLASHCALW 0x400A0000 /* Flash controller */
#define SAM4L_CHIPID 0x400E0740 /* Chip Identification */ #define SAM4L_CHIPID 0x400E0740 /* Chip Identification */
@ -253,7 +253,7 @@ static int sam4l_check_page_erased(struct flash_bank *bank, uint32_t pn,
/* Issue a quick page read to verify that we've erased this page */ /* Issue a quick page read to verify that we've erased this page */
res = sam4l_flash_command(bank->target, SAM4L_FCMD_QPR, pn); res = sam4l_flash_command(bank->target, SAM4L_FCMD_QPR, pn);
if (res != ERROR_OK) { if (res != ERROR_OK) {
LOG_ERROR("Quick page read %d failed", pn); LOG_ERROR("Quick page read %" PRIu32 " failed", pn);
return res; return res;
} }
@ -307,7 +307,7 @@ static int sam4l_probe(struct flash_bank *bank)
chip->flash_kb = 512; chip->flash_kb = 512;
break; break;
default: default:
LOG_ERROR("Unknown flash size (chip ID is %08X), assuming 128K", id); LOG_ERROR("Unknown flash size (chip ID is %08" PRIx32 "), assuming 128K", id);
chip->flash_kb = 128; chip->flash_kb = 128;
break; break;
} }
@ -351,8 +351,8 @@ static int sam4l_probe(struct flash_bank *bank)
/* Done */ /* Done */
chip->probed = true; chip->probed = true;
LOG_INFO("SAM4L MCU: %s (Rev %c) (%uKB Flash with %d %dB pages, %uKB RAM)", LOG_INFO("SAM4L MCU: %s (Rev %c) (%" PRIu32 "KB Flash with %d %" PRId32 "B pages, %" PRIu32 "KB RAM)",
chip->details ? chip->details->name : "unknown", 'A' + (id & 0xF), chip->details ? chip->details->name : "unknown", (char)('A' + (id & 0xF)),
chip->flash_kb, chip->num_pages, chip->page_size, chip->ram_kb); chip->flash_kb, chip->num_pages, chip->page_size, chip->ram_kb);
return ERROR_OK; return ERROR_OK;

8
src/flash/nor/at91samd.c
View File

@ -26,7 +26,7 @@
#define SAMD_NUM_SECTORS 16 #define SAMD_NUM_SECTORS 16
#define SAMD_FLASH 0x00000000 /* physical Flash memory */ #define SAMD_FLASH ((uint32_t)0x00000000) /* physical Flash memory */
#define SAMD_DSU 0x41002000 /* Device Service Unit */ #define SAMD_DSU 0x41002000 /* Device Service Unit */
#define SAMD_NVMCTRL 0x41004000 /* Non-volatile memory controller */ #define SAMD_NVMCTRL 0x41004000 /* Non-volatile memory controller */
@ -218,7 +218,7 @@ static int samd_probe(struct flash_bank *bank)
* multiplied by the number of pages. */ * multiplied by the number of pages. */
if (bank->size != chip->num_pages * chip->page_size) { if (bank->size != chip->num_pages * chip->page_size) {
LOG_WARNING("SAMD: bank size doesn't match NVM parameters. " LOG_WARNING("SAMD: bank size doesn't match NVM parameters. "
"Identified %uKB Flash but NVMCTRL reports %u %uB pages", "Identified %" PRIu32 "KB Flash but NVMCTRL reports %u %" PRIu32 "B pages",
part->flash_kb, chip->num_pages, chip->page_size); part->flash_kb, chip->num_pages, chip->page_size);
} }
@ -243,7 +243,7 @@ static int samd_probe(struct flash_bank *bank)
/* Done */ /* Done */
chip->probed = true; chip->probed = true;
LOG_INFO("SAMD MCU: %s (%uKB Flash, %uKB RAM)", part->name, LOG_INFO("SAMD MCU: %s (%" PRIu32 "KB Flash, %" PRIu32 "KB RAM)", part->name,
part->flash_kb, part->ram_kb); part->flash_kb, part->ram_kb);
return ERROR_OK; return ERROR_OK;
@ -337,7 +337,7 @@ static int samd_erase_row(struct flash_bank *bank, uint32_t address)
} }
if (res != ERROR_OK || error) { if (res != ERROR_OK || error) {
LOG_ERROR("Failed to erase row containing %08X" PRIx32, address); LOG_ERROR("Failed to erase row containing %08" PRIx32, address);
return ERROR_FAIL; return ERROR_FAIL;
} }

8
src/target/arm_adi_v5.c
View File

@ -1225,8 +1225,8 @@ static int dap_rom_display(struct command_context *cmd_ctx,
"start address 0x%" PRIx32, component_base, "start address 0x%" PRIx32, component_base,
/* component may take multiple 4K pages */ /* component may take multiple 4K pages */
(uint32_t)(component_base - 0x1000*(c_pid4 >> 4))); (uint32_t)(component_base - 0x1000*(c_pid4 >> 4)));
command_print(cmd_ctx, "\t\tComponent class is 0x%x, %s", command_print(cmd_ctx, "\t\tComponent class is 0x%" PRIx8 ", %s",
(c_cid1 >> 4) & 0xf, (uint8_t)((c_cid1 >> 4) & 0xf),
/* See ARM IHI 0029B Table 3-3 */ /* See ARM IHI 0029B Table 3-3 */
class_description[(c_cid1 >> 4) & 0xf]); class_description[(c_cid1 >> 4) & 0xf]);
@ -1337,8 +1337,8 @@ static int dap_rom_display(struct command_context *cmd_ctx,
} }
break; break;
} }
command_print(cmd_ctx, "\t\tType is 0x%02x, %s, %s", command_print(cmd_ctx, "\t\tType is 0x%02" PRIx8 ", %s, %s",
devtype & 0xff, (uint8_t)(devtype & 0xff),
major, subtype); major, subtype);
/* REVISIT also show 0xfc8 DevId */ /* REVISIT also show 0xfc8 DevId */
} }

4
src/target/target.c
View File

@ -5712,7 +5712,7 @@ COMMAND_HANDLER(handle_test_mem_access_command)
read_buf[i] = read_ref[i]; read_buf[i] = read_ref[i];
} }
command_print_sameline(CMD_CTX, command_print_sameline(CMD_CTX,
"Test read %d x %d @ %d to %saligned buffer: ", count, "Test read %" PRIu32 " x %d @ %d to %saligned buffer: ", count,
size, offset, host_offset ? "un" : ""); size, offset, host_offset ? "un" : "");
struct duration bench; struct duration bench;
@ -5784,7 +5784,7 @@ out:
for (size_t i = 0; i < host_bufsiz; i++) for (size_t i = 0; i < host_bufsiz; i++)
write_buf[i] = rand(); write_buf[i] = rand();
command_print_sameline(CMD_CTX, command_print_sameline(CMD_CTX,
"Test write %d x %d @ %d from %saligned buffer: ", count, "Test write %" PRIu32 " x %d @ %d from %saligned buffer: ", count,
size, offset, host_offset ? "un" : ""); size, offset, host_offset ? "un" : "");
retval = target_write_memory(target, wa->address, 1, num_bytes, test_pattern); retval = target_write_memory(target, wa->address, 1, num_bytes, test_pattern);