flash/nor/efr32: fixed lockbits and user data

[fw/openocd] / src / flash / nor / lpcspifi.c

diff --git a/src/flash/nor/lpcspifi.c b/src/flash/nor/lpcspifi.c
index 04ac3bb4dcf33b18cd4c525cc84feec8cee8010a..160e2dc6746c27bcd2106fd16d5b3614c448e3d2 100644 (file)
--- a/src/flash/nor/lpcspifi.c
+++ b/src/flash/nor/lpcspifi.c
@@ -47,7 +47,7 @@
 #define SPIFI_INIT_STACK_SIZE  512
 
 struct lpcspifi_flash_bank {
-       int probed;
+       bool probed;
        uint32_t ssp_base;
        uint32_t io_base;
        uint32_t ioconfig_base;
@@ -66,13 +66,13 @@ FLASH_BANK_COMMAND_HANDLER(lpcspifi_flash_bank_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        lpcspifi_info = malloc(sizeof(struct lpcspifi_flash_bank));
-       if (lpcspifi_info == NULL) {
+       if (!lpcspifi_info) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
 
        bank->driver_priv = lpcspifi_info;
-       lpcspifi_info->probed = 0;
+       lpcspifi_info->probed = false;
 
        return ERROR_OK;
 }
@@ -216,7 +216,7 @@ static int lpcspifi_set_hw_mode(struct flash_bank *bank)
 
        /* Run the algorithm */
        LOG_DEBUG("Running SPIFI init algorithm");
-       retval = target_run_algorithm(target, 0 , NULL, 2, reg_params,
+       retval = target_run_algorithm(target, 0, NULL, 2, reg_params,
                spifi_init_algorithm->address,
                spifi_init_algorithm->address + sizeof(spifi_init_code) - 2,
                1000, &armv7m_info);
@@ -414,7 +414,8 @@ static int lpcspifi_bulk_erase(struct flash_bank *bank)
        return retval;
 }
 
-static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
+static int lpcspifi_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
        struct lpcspifi_flash_bank *lpcspifi_info = bank->driver_priv;
@@ -422,16 +423,15 @@ static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
        struct armv7m_algorithm armv7m_info;
        struct working_area *erase_algorithm;
        int retval = ERROR_OK;
-       int sector;
 
-       LOG_DEBUG("erase from sector %d to sector %d", first, last);
+       LOG_DEBUG("erase from sector %u to sector %u", first, last);
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors)) {
+       if ((last < first) || (last >= bank->num_sectors)) {
                LOG_ERROR("Flash sector invalid");
                return ERROR_FLASH_SECTOR_INVALID;
        }
@@ -441,9 +441,9 @@ static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
 
-       for (sector = first; sector <= last; sector++) {
+       for (unsigned int sector = first; sector <= last; sector++) {
                if (bank->sectors[sector].is_protected) {
-                       LOG_ERROR("Flash sector %d protected", sector);
+                       LOG_ERROR("Flash sector %u protected", sector);
                        return ERROR_FAIL;
                }
        }
@@ -550,7 +550,7 @@ static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
        buf_set_u32(reg_params[3].value, 0, 32, bank->sectors[first].size);
 
        /* Run the algorithm */
-       retval = target_run_algorithm(target, 0 , NULL, 4, reg_params,
+       retval = target_run_algorithm(target, 0, NULL, 4, reg_params,
                erase_algorithm->address,
                erase_algorithm->address + sizeof(lpcspifi_flash_erase_code) - 4,
                3000*(last - first + 1), &armv7m_info);
@@ -571,11 +571,9 @@ static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
 }
 
 static int lpcspifi_protect(struct flash_bank *bank, int set,
-       int first, int last)
+       unsigned int first, unsigned int last)
 {
-       int sector;
-
-       for (sector = first; sector <= last; sector++)
+       for (unsigned int sector = first; sector <= last; sector++)
                bank->sectors[sector].is_protected = set;
        return ERROR_OK;
 }
@@ -590,7 +588,6 @@ static int lpcspifi_write(struct flash_bank *bank, const uint8_t *buffer,
        struct reg_param reg_params[5];
        struct armv7m_algorithm armv7m_info;
        struct working_area *write_algorithm;
-       int sector;
        int retval = ERROR_OK;
 
        LOG_DEBUG("offset=0x%08" PRIx32 " count=0x%08" PRIx32,
@@ -607,14 +604,14 @@ static int lpcspifi_write(struct flash_bank *bank, const uint8_t *buffer,
        }
 
        /* Check sector protection */
-       for (sector = 0; sector < bank->num_sectors; sector++) {
+       for (unsigned int sector = 0; sector < bank->num_sectors; sector++) {
                /* Start offset in or before this sector? */
                /* End offset in or behind this sector? */
                if ((offset <
                                (bank->sectors[sector].offset + bank->sectors[sector].size))
                        && ((offset + count - 1) >= bank->sectors[sector].offset)
                        && bank->sectors[sector].is_protected) {
-                       LOG_ERROR("Flash sector %d protected", sector);
+                       LOG_ERROR("Flash sector %u protected", sector);
                        return ERROR_FAIL;
                }
        }
@@ -852,7 +849,7 @@ static int lpcspifi_probe(struct flash_bank *bank)
        /* If we've already probed, we should be fine to skip this time. */
        if (lpcspifi_info->probed)
                return ERROR_OK;
-       lpcspifi_info->probed = 0;
+       lpcspifi_info->probed = false;
 
        lpcspifi_info->ssp_base = 0x40083000;
        lpcspifi_info->io_base = 0x400F4000;
@@ -897,12 +894,12 @@ static int lpcspifi_probe(struct flash_bank *bank)
        /* create and fill sectors array */
        bank->num_sectors = lpcspifi_info->dev->size_in_bytes / sectorsize;
        sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
-       if (sectors == NULL) {
+       if (!sectors) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
 
-       for (int sector = 0; sector < bank->num_sectors; sector++) {
+       for (unsigned int sector = 0; sector < bank->num_sectors; sector++) {
                sectors[sector].offset = sector * sectorsize;
                sectors[sector].size = sectorsize;
                sectors[sector].is_erased = -1;
@@ -911,7 +908,7 @@ static int lpcspifi_probe(struct flash_bank *bank)
 
        bank->sectors = sectors;
 
-       lpcspifi_info->probed = 1;
+       lpcspifi_info->probed = true;
        return ERROR_OK;
 }
 
@@ -929,17 +926,16 @@ static int lpcspifi_protect_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int get_lpcspifi_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_lpcspifi_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        struct lpcspifi_flash_bank *lpcspifi_info = bank->driver_priv;
 
        if (!(lpcspifi_info->probed)) {
-               snprintf(buf, buf_size,
-                       "\nSPIFI flash bank not probed yet\n");
+               command_print_sameline(cmd, "\nSPIFI flash bank not probed yet\n");
                return ERROR_OK;
        }
 
-       snprintf(buf, buf_size, "\nSPIFI flash information:\n"
+       command_print_sameline(cmd, "\nSPIFI flash information:\n"
                "  Device \'%s\' (ID 0x%08" PRIx32 ")\n",
                lpcspifi_info->dev->name, lpcspifi_info->dev->device_id);