flash/nor/nrf5: unify size of HWID

[openocd.git] / src / flash / nor / msp432.c

diff --git a/src/flash/nor/msp432.c b/src/flash/nor/msp432.c
index 95c99b970f61ef2e1f7d12b6f197fdc3092894ae..b6933e1e9bbdd5b1c3d25821592390da9a6b9c23 100644 (file)
--- a/src/flash/nor/msp432.c
+++ b/src/flash/nor/msp432.c
@@ -320,7 +320,7 @@ static int msp432_init(struct flash_bank *bank)
                /* Explicit device type check failed. Report this. */
                LOG_WARNING(
                        "msp432: Unrecognized MSP432P4 Device ID and Hardware "
-                       "Rev (%04X, %02X)", msp432_bank->device_id,
+                       "Rev (%04" PRIX32 ", %02" PRIX32 ")", msp432_bank->device_id,
                        msp432_bank->hardware_rev);
        } else if (MSP432P401X_DEPR == msp432_bank->device_type) {
                LOG_WARNING(
@@ -330,7 +330,7 @@ static int msp432_init(struct flash_bank *bank)
                /* Explicit device type check failed. Report this. */
                LOG_WARNING(
                        "msp432: Unrecognized MSP432E4 DID0 and DID1 values "
-                       "(%08X, %08X)", msp432_bank->device_id,
+                       "(%08" PRIX32 ", %08" PRIX32 ")", msp432_bank->device_id,
                        msp432_bank->hardware_rev);
        }
 
@@ -590,7 +590,8 @@ FLASH_BANK_COMMAND_HANDLER(msp432_flash_bank_command)
        return ERROR_OK;
 }
 
-static int msp432_erase(struct flash_bank *bank, int first, int last)
+static int msp432_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
        struct msp432_bank *msp432_bank = bank->driver_priv;
@@ -628,7 +629,7 @@ static int msp432_erase(struct flash_bank *bank, int first, int last)
        }
 
        /* Erase requested sectors one by one */
-       for (int i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
 
                /* Skip TVL (read-only) sector of the info bank */
                if (is_info && 1 == i)
@@ -809,7 +810,7 @@ static int msp432_probe(struct flash_bank *bank)
 
        uint32_t sector_length;
        uint32_t size;
-       int num_sectors;
+       unsigned int num_sectors;
 
        bool is_main = FLASH_BASE == bank->base;
        bool is_info = P4_FLASH_INFO_BASE == bank->base;
@@ -901,10 +902,8 @@ static int msp432_probe(struct flash_bank *bank)
                }
        }
 
-       if (NULL != bank->sectors) {
-               free(bank->sectors);
-               bank->sectors = NULL;
-       }
+       free(bank->sectors);
+       bank->sectors = NULL;
 
        if (num_sectors > 0) {
                bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors);
@@ -918,7 +917,7 @@ static int msp432_probe(struct flash_bank *bank)
        bank->num_sectors = num_sectors;
        msp432_bank->sector_length = sector_length;
 
-       for (int i = 0; i < num_sectors; i++) {
+       for (unsigned int i = 0; i < num_sectors; i++) {
                bank->sectors[i].offset = i * sector_length;
                bank->sectors[i].size = sector_length;
                bank->sectors[i].is_erased = -1;
@@ -1013,14 +1012,14 @@ static int msp432_info(struct flash_bank *bank, char *buf, int buf_size)
                        break;
                case MSP432E4X_GUESS:
                        printed = snprintf(buf, buf_size,
-                               "Unrecognized MSP432E4 DID0 and DID1 IDs (%08X, %08X)",
+                               "Unrecognized MSP432E4 DID0 and DID1 IDs (%08" PRIX32 ", %08" PRIX32 ")",
                                msp432_bank->device_id, msp432_bank->hardware_rev);
                        break;
                case MSP432P401X_GUESS:
                case MSP432P411X_GUESS:
                default:
                        printed = snprintf(buf, buf_size,
-                               "Unrecognized MSP432P4 Device ID and Hardware Rev (%04X, %02X)",
+                               "Unrecognized MSP432P4 Device ID and Hardware Rev (%04" PRIX32 ", %02" PRIX32 ")",
                                msp432_bank->device_id, msp432_bank->hardware_rev);
                        break;
        }
@@ -1045,7 +1044,7 @@ static void msp432_flash_free_driver_priv(struct flash_bank *bank)
 
        /* A single private struct is shared between main and info banks */
        /* Only free it on the call for main bank */
-       if (is_main && (NULL != bank->driver_priv))
+       if (is_main)
                free(bank->driver_priv);
 
        /* Forget about the private struct on both main and info banks */