stm32l4x: cosmetic simplification of get_stm32l4_info

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

diff --git a/src/flash/nor/fespi.c b/src/flash/nor/fespi.c
index 5d8f810ad44339fa9f5809fbd4475335f1325940..02630ac24fa521e30b0ae68d187871e3fdaef895 100644 (file)
--- a/src/flash/nor/fespi.c
+++ b/src/flash/nor/fespi.c
@@ -122,7 +122,7 @@
 
 
 struct fespi_flash_bank {
-       int probed;
+       bool probed;
        target_addr_t ctrl_base;
        const struct flash_device *dev;
 };
@@ -136,8 +136,9 @@ struct fespi_target {
 /* TODO !!! What is the right naming convention here? */
 static const struct fespi_target target_devices[] = {
        /* name,   tap_idcode, ctrl_base */
-       { "Freedom E300 SPI Flash",  0x10e31913 , 0x10014000 },
-       { NULL,    0,           0          }
+       { "Freedom E310-G000 SPI Flash", 0x10e31913, 0x10014000 },
+       { "Freedom E310-G002 SPI Flash", 0x20000913, 0x10014000 },
+       { NULL, 0, 0 }
 };
 
 FLASH_BANK_COMMAND_HANDLER(fespi_flash_bank_command)
@@ -156,7 +157,7 @@ FLASH_BANK_COMMAND_HANDLER(fespi_flash_bank_command)
        }
 
        bank->driver_priv = fespi_info;
-       fespi_info->probed = 0;
+       fespi_info->probed = false;
        fespi_info->ctrl_base = 0;
        if (CMD_ARGC >= 7) {
                COMMAND_PARSE_ADDRESS(CMD_ARGV[6], fespi_info->ctrl_base);
@@ -182,13 +183,13 @@ static int fespi_read_reg(struct flash_bank *bank, uint32_t *value, target_addr_
 }
 
 static int fespi_write_reg(struct flash_bank *bank, target_addr_t address, uint32_t value)
-{                                                              \
+{
        struct target *target = bank->target;
        struct fespi_flash_bank *fespi_info = bank->driver_priv;
 
        int result = target_write_u32(target, fespi_info->ctrl_base + address, value);
        if (result != ERROR_OK) {
-               LOG_ERROR("fespi_write_reg() error writing 0x%x to " TARGET_ADDR_FMT,
+               LOG_ERROR("fespi_write_reg() error writing 0x%" PRIx32 " to " TARGET_ADDR_FMT,
                                value, fespi_info->ctrl_base + address);
                return result;
        }
@@ -273,7 +274,7 @@ static int fespi_rx(struct flash_bank *bank, uint8_t *out)
                        break;
                int64_t now = timeval_ms();
                if (now - start > 1000) {
-                       LOG_ERROR("rxfifo didn't go positive (value=0x%x).", value);
+                       LOG_ERROR("rxfifo didn't go positive (value=0x%" PRIx32 ").", value);
                        return ERROR_TARGET_TIMEOUT;
                }
        }
@@ -358,21 +359,21 @@ static int fespi_erase_sector(struct flash_bank *bank, int sector)
        return ERROR_OK;
 }
 
-static int fespi_erase(struct flash_bank *bank, int first, int last)
+static int fespi_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
        struct fespi_flash_bank *fespi_info = bank->driver_priv;
        int retval = ERROR_OK;
-       int sector;
 
-       LOG_DEBUG("%s: from sector %d to sector %d", __func__, first, last);
+       LOG_DEBUG("%s: from sector %u to sector %u", __func__, 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;
        }
@@ -382,9 +383,9 @@ static int fespi_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;
                }
        }
@@ -409,7 +410,7 @@ static int fespi_erase(struct flash_bank *bank, int first, int last)
        if (retval != ERROR_OK)
                goto done;
 
-       for (sector = first; sector <= last; sector++) {
+       for (unsigned int sector = first; sector <= last; sector++) {
                retval = fespi_erase_sector(bank, sector);
                if (retval != ERROR_OK)
                        goto done;
@@ -424,11 +425,9 @@ done:
 }
 
 static int fespi_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;
 }
@@ -439,7 +438,7 @@ static int slow_fespi_write_buffer(struct flash_bank *bank,
        uint32_t ii;
 
        if (offset & 0xFF000000) {
-               LOG_ERROR("FESPI interface does not support greater than 3B addressing, can't write to offset 0x%x",
+               LOG_ERROR("FESPI interface does not support greater than 3B addressing, can't write to offset 0x%" PRIx32,
                                offset);
                return ERROR_FAIL;
        }
@@ -652,7 +651,7 @@ static int steps_add_buffer_write(struct algorithm_steps *as,
                const uint8_t *buffer, uint32_t chip_offset, uint32_t len)
 {
        if (chip_offset & 0xFF000000) {
-               LOG_ERROR("FESPI interface does not support greater than 3B addressing, can't write to offset 0x%x",
+               LOG_ERROR("FESPI interface does not support greater than 3B addressing, can't write to offset 0x%" PRIx32,
                                chip_offset);
                return ERROR_FAIL;
        }
@@ -734,7 +733,6 @@ static int fespi_write(struct flash_bank *bank, const uint8_t *buffer,
        struct target *target = bank->target;
        struct fespi_flash_bank *fespi_info = bank->driver_priv;
        uint32_t cur_count, page_size, page_offset;
-       int sector;
        int retval = ERROR_OK;
 
        LOG_DEBUG("%s: offset=0x%08" PRIx32 " count=0x%08" PRIx32,
@@ -751,14 +749,14 @@ static int fespi_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;
                }
        }
@@ -918,7 +916,7 @@ static int fespi_probe(struct flash_bank *bank)
 
        if (fespi_info->probed)
                free(bank->sectors);
-       fespi_info->probed = 0;
+       fespi_info->probed = false;
 
        if (fespi_info->ctrl_base == 0) {
                for (target_device = target_devices ; target_device->name ; ++target_device)
@@ -993,7 +991,7 @@ static int fespi_probe(struct flash_bank *bank)
                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;
@@ -1001,7 +999,7 @@ static int fespi_probe(struct flash_bank *bank)
        }
 
        bank->sectors = sectors;
-       fespi_info->probed = 1;
+       fespi_info->probed = true;
        return ERROR_OK;
 }