Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash/nor: Use proper data types in driver API
[openocd.git] / src / flash / nor / psoc4.c
diff --git a/src/flash/nor/psoc4.c b/src/flash/nor/psoc4.c
index 1eb6a26eda453426064cfba171212ab3ebea4e99..be9a886a264512d18b041cdd6605e2a850f76c20 100644 (file)
--- a/src/flash/nor/psoc4.c
+++ b/src/flash/nor/psoc4.c
@@ -157,7 +157,7 @@ const struct psoc4_chip_family psoc4_families[] = {
 struct psoc4_flash_bank {
        uint32_t row_size;
        uint32_t user_bank_size;
 struct psoc4_flash_bank {
        uint32_t row_size;
        uint32_t user_bank_size;
-       int num_macros;
+       unsigned int num_macros;
        bool probed;
        uint8_t cmd_program_row;
        uint16_t family_id;
        bool probed;
        uint8_t cmd_program_row;
        uint16_t family_id;
@@ -496,16 +496,15 @@ static int psoc4_protect_check(struct flash_bank *bank)
 
        uint32_t prot_addr = PSOC4_SFLASH_MACRO0;
        int retval;
 
        uint32_t prot_addr = PSOC4_SFLASH_MACRO0;
        int retval;
-       int s = 0;
-       int m, i;
        uint8_t bf[PSOC4_ROWS_PER_MACRO/8];
        uint8_t bf[PSOC4_ROWS_PER_MACRO/8];
+       unsigned int s = 0;
 
 
-       for (m = 0; m < psoc4_info->num_macros; m++, prot_addr += PSOC4_SFLASH_MACRO_SIZE) {
+       for (unsigned int m = 0; m < psoc4_info->num_macros; m++, prot_addr += PSOC4_SFLASH_MACRO_SIZE) {
                retval = target_read_memory(target, prot_addr, 4, PSOC4_ROWS_PER_MACRO/32, bf);
                if (retval != ERROR_OK)
                        return retval;
 
                retval = target_read_memory(target, prot_addr, 4, PSOC4_ROWS_PER_MACRO/32, bf);
                if (retval != ERROR_OK)
                        return retval;
 
-               for (i = 0; i < PSOC4_ROWS_PER_MACRO && s < bank->num_sectors; i++, s++)
+               for (unsigned int i = 0; i < PSOC4_ROWS_PER_MACRO && s < bank->num_sectors; i++, s++)
                        bank->sectors[s].is_protected = bf[i/8] & (1 << (i%8)) ? 1 : 0;
        }
 
                        bank->sectors[s].is_protected = bf[i/8] & (1 << (i%8)) ? 1 : 0;
        }
 
@@ -515,7 +514,6 @@ static int psoc4_protect_check(struct flash_bank *bank)
 
 static int psoc4_mass_erase(struct flash_bank *bank)
 {
 
 static int psoc4_mass_erase(struct flash_bank *bank)
 {
-       int i;
        int retval = psoc4_flash_prepare(bank);
        if (retval != ERROR_OK)
                return retval;
        int retval = psoc4_flash_prepare(bank);
        if (retval != ERROR_OK)
                return retval;
@@ -528,14 +526,15 @@ static int psoc4_mass_erase(struct flash_bank *bank)
 
        if (retval == ERROR_OK)
                /* set all sectors as erased */
 
        if (retval == ERROR_OK)
                /* set all sectors as erased */
-               for (i = 0; i < bank->num_sectors; i++)
+               for (unsigned int i = 0; i < bank->num_sectors; i++)
                        bank->sectors[i].is_erased = 1;
 
        return retval;
 }
 
 
                        bank->sectors[i].is_erased = 1;
 
        return retval;
 }
 
 
-static int psoc4_erase(struct flash_bank *bank, int first, int last)
+static int psoc4_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct psoc4_flash_bank *psoc4_info = bank->driver_priv;
        if (psoc4_info->cmd_program_row == PSOC4_CMD_WRITE_ROW) {
 {
        struct psoc4_flash_bank *psoc4_info = bank->driver_priv;
        if (psoc4_info->cmd_program_row == PSOC4_CMD_WRITE_ROW) {
@@ -552,7 +551,8 @@ static int psoc4_erase(struct flash_bank *bank, int first, int last)
 }
 
 
 }
 
 
-static int psoc4_protect(struct flash_bank *bank, int set, int first, int last)
+static int psoc4_protect(struct flash_bank *bank, int set, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
        struct psoc4_flash_bank *psoc4_info = bank->driver_priv;
 {
        struct target *target = bank->target;
        struct psoc4_flash_bank *psoc4_info = bank->driver_priv;
@@ -567,8 +567,8 @@ static int psoc4_protect(struct flash_bank *bank, int set, int first, int last)
        uint32_t *sysrq_buffer = NULL;
        const int param_sz = 8;
        int chip_prot = PSOC4_CHIP_PROT_OPEN;
        uint32_t *sysrq_buffer = NULL;
        const int param_sz = 8;
        int chip_prot = PSOC4_CHIP_PROT_OPEN;
-       int i, m, sect;
-       int num_bits = bank->num_sectors;
+       unsigned int i;
+       unsigned int num_bits = bank->num_sectors;
 
        if (num_bits > PSOC4_ROWS_PER_MACRO)
                num_bits = PSOC4_ROWS_PER_MACRO;
 
        if (num_bits > PSOC4_ROWS_PER_MACRO)
                num_bits = PSOC4_ROWS_PER_MACRO;
@@ -584,7 +584,7 @@ static int psoc4_protect(struct flash_bank *bank, int set, int first, int last)
        for (i = first; i <= last && i < bank->num_sectors; i++)
                bank->sectors[i].is_protected = set;
 
        for (i = first; i <= last && i < bank->num_sectors; i++)
                bank->sectors[i].is_protected = set;
 
-       for (m = 0, sect = 0; m < psoc4_info->num_macros; m++) {
+       for (unsigned int m = 0, sect = 0; m < psoc4_info->num_macros; m++) {
                uint8_t *p = (uint8_t *)(sysrq_buffer + 2);
                memset(p, 0, prot_sz);
                for (i = 0; i < num_bits && sect < bank->num_sectors; i++, sect++) {
                uint8_t *p = (uint8_t *)(sysrq_buffer + 2);
                memset(p, 0, prot_sz);
                for (i = 0; i < num_bits && sect < bank->num_sectors; i++, sect++) {
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)