flash/nor/max32xxx: Use 'bool' data type

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

diff --git a/src/flash/nor/max32xxx.c b/src/flash/nor/max32xxx.c
index 12e3db9403530e942a7ab1872bf9e29106345ccf..65898cd647001498389cc8fb953df3ae2b83803d 100644 (file)
--- a/src/flash/nor/max32xxx.c
+++ b/src/flash/nor/max32xxx.c
@@ -70,7 +70,7 @@
 static int max32xxx_mass_erase(struct flash_bank *bank);
 
 struct max32xxx_flash_bank {
-       int probed;
+       bool probed;
        int max326xx;
        unsigned int flash_size;
        unsigned int flc_base;
@@ -118,7 +118,7 @@ static int get_info(struct flash_bank *bank, char *buf, int buf_size)
        int printed;
        struct max32xxx_flash_bank *info = bank->driver_priv;
 
-       if (info->probed == 0)
+       if (!info->probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        printed = snprintf(buf, buf_size, "\nMaxim Integrated max32xxx flash driver\n");
@@ -209,21 +209,20 @@ static int max32xxx_protect_check(struct flash_bank *bank)
 {
        struct max32xxx_flash_bank *info = bank->driver_priv;
        struct target *target = bank->target;
-       int i;
        uint32_t temp_reg;
 
-       if (info->probed == 0)
+       if (!info->probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        if (!info->max326xx) {
-               for (i = 0; i < bank->num_sectors; i++)
+               for (unsigned i = 0; i < bank->num_sectors; i++)
                        bank->sectors[i].is_protected = -1;
 
                return ERROR_FLASH_OPER_UNSUPPORTED;
        }
 
        /* Check the protection */
-       for (i = 0; i < bank->num_sectors; i++) {
+       for (unsigned i = 0; i < bank->num_sectors; i++) {
                if (i%32 == 0)
                        target_read_u32(target, info->flc_base + FLSH_PROT + ((i/32)*4), &temp_reg);
 
@@ -235,9 +234,9 @@ static int max32xxx_protect_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int max32xxx_erase(struct flash_bank *bank, int first, int last)
+static int max32xxx_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
-       int banknr;
        uint32_t flsh_cn, flsh_int;
        struct max32xxx_flash_bank *info = bank->driver_priv;
        struct target *target = bank->target;
@@ -249,10 +248,10 @@ static int max32xxx_erase(struct flash_bank *bank, int first, int last)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (info->probed == 0)
+       if (!info->probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors))
+       if ((last < first) || (last >= bank->num_sectors))
                return ERROR_FLASH_SECTOR_INVALID;
 
        if ((first == 0) && (last == (bank->num_sectors - 1)))
@@ -265,11 +264,11 @@ static int max32xxx_erase(struct flash_bank *bank, int first, int last)
                return retval;
 
        int erased = 0;
-       for (banknr = first; banknr <= last; banknr++) {
+       for (unsigned int banknr = first; banknr <= last; banknr++) {
 
                /* Check the protection */
                if (bank->sectors[banknr].is_protected == 1) {
-                       LOG_WARNING("Flash sector %d is protected", banknr);
+                       LOG_WARNING("Flash sector %u is protected", banknr);
                        continue;
                } else
                        erased = 1;
@@ -311,7 +310,7 @@ static int max32xxx_erase(struct flash_bank *bank, int first, int last)
        }
 
        if (!erased) {
-               LOG_ERROR("All pages protected %d to %d", first, last);
+               LOG_ERROR("All pages protected %u to %u", first, last);
                max32xxx_flash_op_post(bank);
                return ERROR_FAIL;
        }
@@ -322,11 +321,11 @@ static int max32xxx_erase(struct flash_bank *bank, int first, int last)
        return ERROR_OK;
 }
 
-static int max32xxx_protect(struct flash_bank *bank, int set, int first, int last)
+static int max32xxx_protect(struct flash_bank *bank, int set,
+               unsigned int first, unsigned int last)
 {
        struct max32xxx_flash_bank *info = bank->driver_priv;
        struct target *target = bank->target;
-       int page;
        uint32_t temp_reg;
 
        if (bank->target->state != TARGET_HALTED) {
@@ -334,17 +333,17 @@ static int max32xxx_protect(struct flash_bank *bank, int set, int first, int las
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (info->probed == 0)
+       if (!info->probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        if (!info->max326xx)
                return ERROR_FLASH_OPER_UNSUPPORTED;
 
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors))
+       if ((last < first) || (last >= bank->num_sectors))
                return ERROR_FLASH_SECTOR_INVALID;
 
        /* Setup the protection on the pages given */
-       for (page = first; page <= last; page++) {
+       for (unsigned int page = first; page <= last; page++) {
                if (set) {
                        /* Set the write/erase bit for this page */
                        target_read_u32(target, info->flc_base + FLSH_PROT + (page/32), &temp_reg);
@@ -460,7 +459,7 @@ static int max32xxx_write(struct flash_bank *bank, const uint8_t *buffer,
        LOG_DEBUG("bank=%p buffer=%p offset=%08" PRIx32 " count=%08" PRIx32 "",
                bank, buffer, offset, count);
 
-       if (info->probed == 0)
+       if (!info->probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        if (offset & 0x3) {
@@ -662,7 +661,7 @@ static int max32xxx_probe(struct flash_bank *bank)
        bank->num_sectors = info->flash_size / info->sector_size;
        bank->sectors = calloc(bank->num_sectors, sizeof(struct flash_sector));
 
-       for (int i = 0; i < bank->num_sectors; i++) {
+       for (unsigned int i = 0; i < bank->num_sectors; i++) {
                bank->sectors[i].offset = i * info->sector_size;
                bank->sectors[i].size = info->sector_size;
                bank->sectors[i].is_erased = -1;
@@ -690,7 +689,7 @@ static int max32xxx_probe(struct flash_bank *bank)
        if (max32xxx_protect_check(bank) == ERROR_FLASH_OPER_UNSUPPORTED)
                LOG_WARNING("Flash protection not supported on this device");
 
-       info->probed = 1;
+       info->probed = true;
        return ERROR_OK;
 }
 
@@ -709,13 +708,13 @@ static int max32xxx_mass_erase(struct flash_bank *bank)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (info->probed == 0)
+       if (!info->probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        int not_protected = 0;
-       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)
-                       LOG_WARNING("Flash sector %d is protected", i);
+                       LOG_WARNING("Flash sector %u is protected", i);
                else
                        not_protected = 1;
        }
@@ -767,12 +766,11 @@ static int max32xxx_mass_erase(struct flash_bank *bank)
 
 COMMAND_HANDLER(max32xxx_handle_mass_erase_command)
 {
-       int i;
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 
        if (CMD_ARGC < 1) {
-               command_print(CMD_CTX, "max32xxx mass_erase <bank>");
+               command_print(CMD, "max32xxx mass_erase <bank>");
                return ERROR_OK;
        }
 
@@ -781,12 +779,12 @@ COMMAND_HANDLER(max32xxx_handle_mass_erase_command)
 
        if (max32xxx_mass_erase(bank) == ERROR_OK) {
                /* set all sectors as erased */
-               for (i = 0; i < bank->num_sectors; i++)
+               for (unsigned i = 0; i < bank->num_sectors; i++)
                        bank->sectors[i].is_erased = 1;
 
-               command_print(CMD_CTX, "max32xxx mass erase complete");
+               command_print(CMD, "max32xxx mass erase complete");
        } else
-               command_print(CMD_CTX, "max32xxx mass erase failed");
+               command_print(CMD, "max32xxx mass erase failed");
 
        return ERROR_OK;
 }
@@ -799,7 +797,7 @@ COMMAND_HANDLER(max32xxx_handle_protection_set_command)
        uint32_t addr, len;
 
        if (CMD_ARGC != 3) {
-               command_print(CMD_CTX, "max32xxx protection_set <bank> <addr> <size>");
+               command_print(CMD, "max32xxx protection_set <bank> <addr> <size>");
                return ERROR_OK;
        }
 
@@ -811,7 +809,7 @@ COMMAND_HANDLER(max32xxx_handle_protection_set_command)
        /* Convert the range to the page numbers */
        if (1 != sscanf(CMD_ARGV[1], "0x%"SCNx32, &addr)) {
                LOG_WARNING("Error parsing address");
-               command_print(CMD_CTX, "max32xxx protection_set <bank> <addr> <size>");
+               command_print(CMD, "max32xxx protection_set <bank> <addr> <size>");
                return ERROR_FAIL;
        }
        /* Mask off the top portion on the address */
@@ -819,7 +817,7 @@ COMMAND_HANDLER(max32xxx_handle_protection_set_command)
 
        if (1 != sscanf(CMD_ARGV[2], "0x%"SCNx32, &len)) {
                LOG_WARNING("Error parsing length");
-               command_print(CMD_CTX, "max32xxx protection_set <bank> <addr> <size>");
+               command_print(CMD, "max32xxx protection_set <bank> <addr> <size>");
                return ERROR_FAIL;
        }
 
@@ -840,9 +838,9 @@ COMMAND_HANDLER(max32xxx_handle_protection_set_command)
        len = addr + (len / info->sector_size) - 1;
 
        if (max32xxx_protect(bank, 1, addr, len) == ERROR_OK)
-               command_print(CMD_CTX, "max32xxx protection set complete");
+               command_print(CMD, "max32xxx protection set complete");
        else
-               command_print(CMD_CTX, "max32xxx protection set failed");
+               command_print(CMD, "max32xxx protection set failed");
 
        return ERROR_OK;
 }
@@ -855,7 +853,7 @@ COMMAND_HANDLER(max32xxx_handle_protection_clr_command)
        uint32_t addr, len;
 
        if (CMD_ARGC != 3) {
-               command_print(CMD_CTX, "max32xxx protection_clr <bank> <addr> <size>");
+               command_print(CMD, "max32xxx protection_clr <bank> <addr> <size>");
                return ERROR_OK;
        }
 
@@ -867,7 +865,7 @@ COMMAND_HANDLER(max32xxx_handle_protection_clr_command)
        /* Convert the range to the page numbers */
        if (1 != sscanf(CMD_ARGV[1], "0x%"SCNx32, &addr)) {
                LOG_WARNING("Error parsing address");
-               command_print(CMD_CTX, "max32xxx protection_clr <bank> <addr> <size>");
+               command_print(CMD, "max32xxx protection_clr <bank> <addr> <size>");
                return ERROR_FAIL;
        }
        /* Mask off the top portion on the address */
@@ -875,7 +873,7 @@ COMMAND_HANDLER(max32xxx_handle_protection_clr_command)
 
        if (1 != sscanf(CMD_ARGV[2], "0x%"SCNx32, &len)) {
                LOG_WARNING("Error parsing length");
-               command_print(CMD_CTX, "max32xxx protection_clr <bank> <addr> <size>");
+               command_print(CMD, "max32xxx protection_clr <bank> <addr> <size>");
                return ERROR_FAIL;
        }
 
@@ -896,9 +894,9 @@ COMMAND_HANDLER(max32xxx_handle_protection_clr_command)
        len = addr + (len / info->sector_size) - 1;
 
        if (max32xxx_protect(bank, 0, addr, len) == ERROR_OK)
-               command_print(CMD_CTX, "max32xxx protection clear complete");
+               command_print(CMD, "max32xxx protection clear complete");
        else
-               command_print(CMD_CTX, "max32xxx protection clear failed");
+               command_print(CMD, "max32xxx protection clear failed");
 
        return ERROR_OK;
 }
@@ -908,10 +906,9 @@ COMMAND_HANDLER(max32xxx_handle_protection_check_command)
        struct flash_bank *bank;
        int retval;
        struct max32xxx_flash_bank *info;
-       int i;
 
        if (CMD_ARGC < 1) {
-               command_print(CMD_CTX, "max32xxx protection_check <bank>");
+               command_print(CMD, "max32xxx protection_check <bank>");
                return ERROR_OK;
        }
 
@@ -928,7 +925,7 @@ COMMAND_HANDLER(max32xxx_handle_protection_check_command)
        }
 
        LOG_WARNING("s:<sector number> a:<address> p:<protection bit>");
-       for (i = 0; i < bank->num_sectors; i += 4) {
+       for (unsigned i = 0; i < bank->num_sectors; i += 4) {
                LOG_WARNING("s:%03d a:0x%06x p:%d | s:%03d a:0x%06x p:%d | s:%03d a:0x%06x p:%d | s:%03d a:0x%06x p:%d",
                (i+0), (i+0)*info->sector_size, bank->sectors[(i+0)].is_protected,
                (i+1), (i+1)*info->sector_size, bank->sectors[(i+1)].is_protected,
@@ -977,6 +974,7 @@ static const struct command_registration max32xxx_command_handlers[] = {
                .mode = COMMAND_EXEC,
                .help = "max32xxx flash command group",
                .chain = max32xxx_exec_command_handlers,
+               .usage = "",
        },
        COMMAND_REGISTRATION_DONE
 };