flash/nor: Use proper data types in driver API

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

diff --git a/src/flash/nor/fespi.c b/src/flash/nor/fespi.c
index 05489fdfb0a6a5e13ec0c3d0e6efbbbad6fada76..134fba6e31c871bc7d064a924c5af9e3e78b4705 100644 (file)
--- a/src/flash/nor/fespi.c
+++ b/src/flash/nor/fespi.c
@@ -359,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;
        }
@@ -383,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;
                }
        }
@@ -410,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;
@@ -425,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;
 }
@@ -735,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,
@@ -752,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;
                }
        }
@@ -994,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;