flash/nor: Use proper data types in driver API

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

diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c
index a8f8d3f0856485fd20b8560c6d382aff2bad7cab..3eb2fc26b5bd169aa557d29224001f6af656c774 100644 (file)
--- a/src/flash/nor/psoc6.c
+++ b/src/flash/nor/psoc6.c
@@ -450,7 +450,7 @@ static int psoc6_protect_check(struct flash_bank *bank)
                        break;
        }
 
-       for (int i = 0; i < bank->num_sectors; i++)
+       for (unsigned int i = 0; i < bank->num_sectors; i++)
                bank->sectors[i].is_protected = is_protected;
 
        return ERROR_OK;
@@ -460,7 +460,8 @@ static int psoc6_protect_check(struct flash_bank *bank)
  * @brief Dummy function, Life Cycle transition is not currently supported
  * @return ERROR_OK always
  *************************************************************************************************/
-static int psoc6_protect(struct flash_bank *bank, int set, int first, int last)
+static int psoc6_protect(struct flash_bank *bank, int set, unsigned int first,
+               unsigned int last)
 {
        (void)bank;
        (void)set;
@@ -609,7 +610,7 @@ static int psoc6_probe(struct flash_bank *bank)
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       size_t num_sectors = bank_size / row_sz;
+       unsigned int num_sectors = bank_size / row_sz;
        bank->size = bank_size;
        bank->chip_width = 4;
        bank->bus_width = 4;
@@ -618,7 +619,7 @@ static int psoc6_probe(struct flash_bank *bank)
 
        bank->num_sectors = num_sectors;
        bank->sectors = calloc(num_sectors, sizeof(struct flash_sector));
-       for (size_t i = 0; i < num_sectors; i++) {
+       for (unsigned int i = 0; i < num_sectors; i++) {
                bank->sectors[i].size = row_sz;
                bank->sectors[i].offset = i * row_sz;
                bank->sectors[i].is_erased = -1;
@@ -717,7 +718,8 @@ static int psoc6_erase_row(struct flash_bank *bank, struct working_area *wa, uin
  * @param last last sector to erase
  * @return ERROR_OK in case of success, ERROR_XXX code otherwise
  *************************************************************************************************/
-static int psoc6_erase(struct flash_bank *bank, int first, int last)
+static int psoc6_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
        struct psoc6_target_info *psoc6_info = bank->driver_priv;
@@ -740,7 +742,7 @@ static int psoc6_erase(struct flash_bank *bank, int first, int last)
                goto exit;
 
        /* Number of rows in single sector */
-       const int rows_in_sector = sector_size / psoc6_info->row_sz;
+       const unsigned int rows_in_sector = sector_size / psoc6_info->row_sz;
 
        while (last >= first) {
                /* Erase Sector if we are on sector boundary and erase size covers whole sector */
@@ -750,7 +752,7 @@ static int psoc6_erase(struct flash_bank *bank, int first, int last)
                        if (hr != ERROR_OK)
                                goto exit_free_wa;
 
-                       for (int i = first; i < first + rows_in_sector; i++)
+                       for (unsigned int i = first; i < first + rows_in_sector; i++)
                                bank->sectors[i].is_erased = 1;
 
                        first += rows_in_sector;