flash/nor: Use proper data types in driver API

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

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 50ab207c14d689b3556030d47c61274f05401ee1..19fb6b2c2ceef95c5dfd5df522205230ec2cb613 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -162,10 +162,10 @@ static void cfi_command(struct flash_bank *bank, uint8_t cmd, uint8_t *cmd_buf)
                cmd_buf[i] = 0;
 
        if (cfi_info->endianness == TARGET_LITTLE_ENDIAN) {
-               for (int i = bank->bus_width; i > 0; i--)
+               for (unsigned int i = bank->bus_width; i > 0; i--)
                        *cmd_buf++ = (i & (bank->chip_width - 1)) ? 0x0 : cmd;
        } else {
-               for (int i = 1; i <= bank->bus_width; i++)
+               for (unsigned int i = 1; i <= bank->bus_width; i++)
                        *cmd_buf++ = (i & (bank->chip_width - 1)) ? 0x0 : cmd;
        }
 }
@@ -217,13 +217,13 @@ static int cfi_get_u8(struct flash_bank *bank, int sector, uint32_t offset, uint
                return retval;
 
        if (cfi_info->endianness == TARGET_LITTLE_ENDIAN) {
-               for (int i = 0; i < bank->bus_width / bank->chip_width; i++)
+               for (unsigned int i = 0; i < bank->bus_width / bank->chip_width; i++)
                        data[0] |= data[i];
 
                *val = data[0];
        } else {
                uint8_t value = 0;
-               for (int i = 0; i < bank->bus_width / bank->chip_width; i++)
+               for (unsigned int i = 0; i < bank->bus_width / bank->chip_width; i++)
                        value |= data[bank->bus_width - 1 - i];
 
                *val = value;
@@ -877,14 +877,15 @@ FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
        return cfi_flash_bank_cmd(bank, CMD_ARGC, CMD_ARGV);
 }
 
-static int cfi_intel_erase(struct flash_bank *bank, int first, int last)
+static int cfi_intel_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        cfi_intel_clear_status_register(bank);
 
-       for (int i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
                retval = cfi_send_command(bank, 0x20, cfi_flash_address(bank, i, 0x0));
                if (retval != ERROR_OK)
                        return retval;
@@ -905,7 +906,7 @@ static int cfi_intel_erase(struct flash_bank *bank, int first, int last)
                        if (retval != ERROR_OK)
                                return retval;
 
-                       LOG_ERROR("couldn't erase block %i of flash bank at base "
+                       LOG_ERROR("couldn't erase block %u of flash bank at base "
                                        TARGET_ADDR_FMT, i, bank->base);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
@@ -931,13 +932,14 @@ int cfi_spansion_unlock_seq(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int cfi_spansion_erase(struct flash_bank *bank, int first, int last)
+static int cfi_spansion_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
        struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
-       for (int i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
                retval = cfi_spansion_unlock_seq(bank);
                if (retval != ERROR_OK)
                        return retval;
@@ -970,7 +972,8 @@ static int cfi_spansion_erase(struct flash_bank *bank, int first, int last)
        return cfi_send_command(bank, 0xf0, cfi_flash_address(bank, 0, 0x0));
 }
 
-int cfi_erase(struct flash_bank *bank, int first, int last)
+int cfi_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
@@ -979,7 +982,7 @@ int cfi_erase(struct flash_bank *bank, int first, int last)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors))
+       if ((last < first) || (last >= bank->num_sectors))
                return ERROR_FLASH_SECTOR_INVALID;
 
        if (cfi_info->qry[0] != 'Q')
@@ -999,7 +1002,8 @@ int cfi_erase(struct flash_bank *bank, int first, int last)
        return ERROR_OK;
 }
 
-static int cfi_intel_protect(struct flash_bank *bank, int set, int first, int last)
+static int cfi_intel_protect(struct flash_bank *bank, int set,
+               unsigned int first, unsigned int last)
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
@@ -1016,7 +1020,7 @@ static int cfi_intel_protect(struct flash_bank *bank, int set, int first, int la
 
        cfi_intel_clear_status_register(bank);
 
-       for (int i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
                retval = cfi_send_command(bank, 0x60, cfi_flash_address(bank, i, 0x0));
                if (retval != ERROR_OK)
                        return retval;
@@ -1087,7 +1091,7 @@ static int cfi_intel_protect(struct flash_bank *bank, int set, int first, int la
                 * 3. re-protect what should be protected.
                 *
                 */
-               for (int i = 0; i < bank->num_sectors; i++) {
+               for (unsigned int i = 0; i < bank->num_sectors; i++) {
                        if (bank->sectors[i].is_protected == 1) {
                                cfi_intel_clear_status_register(bank);
 
@@ -1110,7 +1114,8 @@ static int cfi_intel_protect(struct flash_bank *bank, int set, int first, int la
        return cfi_send_command(bank, 0xff, cfi_flash_address(bank, 0, 0x0));
 }
 
-int cfi_protect(struct flash_bank *bank, int set, int first, int last)
+int cfi_protect(struct flash_bank *bank, int set, unsigned int first,
+               unsigned int last)
 {
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
@@ -1146,7 +1151,7 @@ static uint32_t cfi_command_val(struct flash_bank *bank, uint8_t cmd)
                case 4:
                        return target_buffer_get_u32(target, buf);
                default:
-                       LOG_ERROR("Unsupported bank buswidth %d, can't do block memory writes",
+                       LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
                                        bank->bus_width);
                        return 0;
        }
@@ -1266,7 +1271,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, const uint8_t *buffer,
                        target_code_size = sizeof(word_32_code);
                        break;
                default:
-                       LOG_ERROR("Unsupported bank buswidth %d, can't do block memory writes",
+                       LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
                                        bank->bus_width);
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
@@ -1502,7 +1507,7 @@ static int cfi_spansion_write_block_mips(struct flash_bank *bank, const uint8_t
                        }
                        break;
                default:
-                       LOG_ERROR("Unsupported bank buswidth %d, can't do block memory writes",
+                       LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
                                        bank->bus_width);
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
@@ -1881,7 +1886,7 @@ static int cfi_spansion_write_block(struct flash_bank *bank, const uint8_t *buff
                        target_code_size = sizeof(armv4_5_word_32_code);
                        break;
                default:
-                       LOG_ERROR("Unsupported bank buswidth %d, can't do block memory writes",
+                       LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
                                        bank->bus_width);
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
@@ -2286,7 +2291,7 @@ static int cfi_read(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, u
                        return retval;
 
                /* take only bytes we need */
-               for (int i = align; (i < bank->bus_width) && (count > 0); i++, count--)
+               for (unsigned int i = align; (i < bank->bus_width) && (count > 0); i++, count--)
                        *buffer++ = current_word[i];
 
                read_p += bank->bus_width;
@@ -2312,7 +2317,7 @@ static int cfi_read(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, u
                        return retval;
 
                /* take only bytes we need */
-               for (int i = 0; (i < bank->bus_width) && (count > 0); i++, count--)
+               for (unsigned int i = 0; (i < bank->bus_width) && (count > 0); i++, count--)
                        *buffer++ = current_word[i];
        }
 
@@ -2355,9 +2360,7 @@ static int cfi_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t of
                        return retval;
 
                /* replace only bytes that must be written */
-               for (int i = align;
-                    (i < bank->bus_width) && (count > 0);
-                    i++, count--)
+               for (unsigned int i = align; (i < bank->bus_width) && (count > 0); i++, count--)
                        if (cfi_info->data_swap)
                                /* data bytes are swapped (reverse endianness) */
                                current_word[bank->bus_width - i] = *buffer++;
@@ -2440,7 +2443,7 @@ static int cfi_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t of
                                }
                                /* try the slow way? */
                                if (fallback) {
-                                       for (int i = 0; i < bank->bus_width; i++)
+                                       for (unsigned int i = 0; i < bank->bus_width; i++)
                                                current_word[i] = *buffer++;
 
                                        retval = cfi_write_word(bank, current_word, write_p);
@@ -2475,7 +2478,7 @@ static int cfi_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t of
                        return retval;
 
                /* replace only bytes that must be written */
-               for (int i = 0; (i < bank->bus_width) && (count > 0); i++, count--)
+               for (unsigned int i = 0; (i < bank->bus_width) && (count > 0); i++, count--)
                        if (cfi_info->data_swap)
                                /* data bytes are swapped (reverse endianness) */
                                current_word[bank->bus_width - i] = *buffer++;
@@ -2576,7 +2579,7 @@ int cfi_probe(struct flash_bank *bank)
 {
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
        struct target *target = bank->target;
-       int num_sectors = 0;
+       unsigned int num_sectors = 0;
        int sector = 0;
        uint32_t unlock1 = 0x555;
        uint32_t unlock2 = 0x2aa;
@@ -2640,7 +2643,7 @@ int cfi_probe(struct flash_bank *bank)
                        cfi_info->device_id = target_buffer_get_u32(target, value_buf1);
                        break;
                default:
-                       LOG_ERROR("Unsupported bank chipwidth %d, can't probe memory",
+                       LOG_ERROR("Unsupported bank chipwidth %u, can't probe memory",
                                        bank->chip_width);
                        return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -2928,7 +2931,7 @@ static int cfi_intel_protect_check(struct flash_bank *bank)
        if (retval != ERROR_OK)
                return retval;
 
-       for (int i = 0; i < bank->num_sectors; i++) {
+       for (unsigned int i = 0; i < bank->num_sectors; i++) {
                uint8_t block_status;
                retval = cfi_get_u8(bank, i, 0x2, &block_status);
                if (retval != ERROR_OK)
@@ -2957,7 +2960,7 @@ static int cfi_spansion_protect_check(struct flash_bank *bank)
        if (retval != ERROR_OK)
                return retval;
 
-       for (int i = 0; i < bank->num_sectors; i++) {
+       for (unsigned int i = 0; i < bank->num_sectors; i++) {
                uint8_t block_status;
                retval = cfi_get_u8(bank, i, 0x2, &block_status);
                if (retval != ERROR_OK)