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>

diff --git a/src/flash/nor/at91sam4l.c b/src/flash/nor/at91sam4l.c
index 0139f61c87b84dc5797301c20abe8f415341af0f..a5eb67271494c57c08047206689b44e36e3e2c50 100644 (file)
--- a/src/flash/nor/at91sam4l.c
+++ b/src/flash/nor/at91sam4l.c
@@ -35,7 +35,7 @@
 #define SAM4L_NUM_SECTORS 16
 
 /* Locations in memory map */
 #define SAM4L_NUM_SECTORS 16
 
 /* 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_FLASHCALW                0x400A0000 /* Flash controller */
 #define SAM4L_CHIPID           0x400E0740 /* Chip Identification */
 #define SAM4L_FLASH_USER       0x00800000 /* Flash user page region */
 #define SAM4L_FLASHCALW                0x400A0000 /* Flash controller */
 #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 */
        res = sam4l_flash_command(bank->target, SAM4L_FCMD_QPR, pn);
        if (res != ERROR_OK) {
        /* Issue a quick page read to verify that we've erased this page */
        res = sam4l_flash_command(bank->target, SAM4L_FCMD_QPR, pn);
        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;
                        break;
                default:
                        chip->flash_kb = 512;
                        break;
                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;
                        break;
        }
                        chip->flash_kb = 128;
                        break;
        }


@@ -351,8 +351,8 @@ static int sam4l_probe(struct flash_bank *bank)
        /* Done */
        chip->probed = true;
 
        /* Done */
        chip->probed = true;
 

-       LOG_INFO("SAM4L MCU: %s (Rev %c) (%uKB Flash with %d %dB pages, %uKB RAM)",
-                       chip->details ? chip->details->name : "unknown", 'A' + (id & 0xF),
+       LOG_INFO("SAM4L MCU: %s (Rev %c) (%" PRIu32 "KB Flash with %d %" PRId32 "B pages, %" PRIu32 "KB RAM)",
+                       chip->details ? chip->details->name : "unknown", (char)('A' + (id & 0xF)),

                        chip->flash_kb, chip->num_pages, chip->page_size, chip->ram_kb);
 
        return ERROR_OK;
                        chip->flash_kb, chip->num_pages, chip->page_size, chip->ram_kb);
 
        return ERROR_OK;

diff --git a/src/flash/nor/at91samd.c b/src/flash/nor/at91samd.c
index bfd2c6ab0510d3025a90b37d813c6473f0aef8dc..17bc8b99cbcafed2b6bee3a609a32580e99a4576 100644 (file)
--- a/src/flash/nor/at91samd.c
+++ b/src/flash/nor/at91samd.c
@@ -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_NVMCTRL           0x41004000      /* Non-volatile memory controller */
 
 #define SAMD_DSU                       0x41002000      /* Device Service Unit */
 #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. */
        if (bank->size != chip->num_pages * chip->page_size) {
                LOG_WARNING("SAMD: bank size doesn't match NVM parameters. "
         * multiplied by the number of pages. */
        if (bank->size != chip->num_pages * chip->page_size) {
                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 */
        chip->probed = true;
 
        /* Done */
        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);
 
        return ERROR_OK;
                        part->flash_kb, part->ram_kb);
 
        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;
        }
 

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index f29a95d32b3191390ec3c3c56f2564046860a96e..a15590070922fa5cf7fb511c16ed585efa7779b1 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1225,8 +1225,8 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                      "start address 0x%" PRIx32, component_base,
                                      /* component may take multiple 4K pages */
                                      (uint32_t)(component_base - 0x1000*(c_pid4 >> 4)));
                                      "start address 0x%" PRIx32, component_base,
                                      /* component may take multiple 4K pages */
                                      (uint32_t)(component_base - 0x1000*(c_pid4 >> 4)));

-                       command_print(cmd_ctx, "\t\tComponent class is 0x%x, %s",
-                                       (c_cid1 >> 4) & 0xf,
+                       command_print(cmd_ctx, "\t\tComponent class is 0x%" PRIx8 ", %s",
+                                       (uint8_t)((c_cid1 >> 4) & 0xf),

                                        /* See ARM IHI 0029B Table 3-3 */
                                        class_description[(c_cid1 >> 4) & 0xf]);
 
                                        /* See ARM IHI 0029B Table 3-3 */
                                        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",
-                                               devtype & 0xff,
+                               command_print(cmd_ctx, "\t\tType is 0x%02" PRIx8 ", %s, %s",
+                                               (uint8_t)(devtype & 0xff),

                                                major, subtype);
                                /* REVISIT also show 0xfc8 DevId */
                        }
                                                major, subtype);
                                /* REVISIT also show 0xfc8 DevId */
                        }

diff --git a/src/target/target.c b/src/target/target.c
index 32ab1178227665124178bb360481f1972a787fce..9416b25ba6bcd9c8a05bc910b28cd2fd4b27231d 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -5712,7 +5712,7 @@ COMMAND_HANDLER(handle_test_mem_access_command)
                                        read_buf[i] = read_ref[i];
                                }
                                command_print_sameline(CMD_CTX,
                                        read_buf[i] = read_ref[i];
                                }
                                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" : "");
 
                                struct duration bench;
                                                size, offset, host_offset ? "un" : "");
 
                                struct duration bench;


@@ -5784,7 +5784,7 @@ out:
                                for (size_t i = 0; i < host_bufsiz; i++)
                                        write_buf[i] = rand();
                                command_print_sameline(CMD_CTX,
                                for (size_t i = 0; i < host_bufsiz; i++)
                                        write_buf[i] = rand();
                                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" : "");
 
                                retval = target_write_memory(target, wa->address, 1, num_bytes, test_pattern);
                                                size, offset, host_offset ? "un" : "");
 
                                retval = target_write_memory(target, wa->address, 1, num_bytes, test_pattern);