Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
armv7m.h: relax dependency from 'arm_adi_v5.h'
[openocd.git] / src / flash / nor / max32xxx.c
diff --git a/src/flash/nor/max32xxx.c b/src/flash/nor/max32xxx.c
index f51f6e2a99d5d2a93fa3c50d75db3245bdaa191f..e7a690d3a58922dceaa4d8d24160ac398b4ddaec 100644 (file)
--- a/src/flash/nor/max32xxx.c
+++ b/src/flash/nor/max32xxx.c
@@ -21,6 +21,7 @@
 #endif
 
 #include "imp.h"
+#include <helper/binarybuffer.h>
 #include <target/algorithm.h>
 #include <target/armv7m.h>
 
@@ -70,19 +71,19 @@
 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;
        unsigned int sector_size;
        unsigned int clkdiv_value;
-       unsigned int int_state;
+       uint32_t int_state;
        unsigned int burst_size_bits;
 };
 
-/* see contib/loaders/flash/max32xxx/max32xxx.s for src */
+/* see contrib/loaders/flash/max32xxx/max32xxx.s for src */
 static const uint8_t write_code[] = {
-#include "../../contrib/loaders/flash/max32xxx/max32xxx.inc"
+#include "../../../contrib/loaders/flash/max32xxx/max32xxx.inc"
 };
 
 /*             Config Command: flash bank name driver base size chip_width bus_width target [driver_option]
@@ -98,13 +99,13 @@ FLASH_BANK_COMMAND_HANDLER(max32xxx_flash_bank_command)
        }
 
        info = calloc(sizeof(struct max32xxx_flash_bank), 1);
-       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], info->flash_size);
-       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[6], info->flc_base);
-       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[7], info->sector_size);
-       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[8], info->clkdiv_value);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[2], info->flash_size);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[6], info->flc_base);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[7], info->sector_size);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[8], info->clkdiv_value);
 
        if (CMD_ARGC > 9)
-               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[9], info->burst_size_bits);
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[9], info->burst_size_bits);
        else
                info->burst_size_bits = 32;
 
@@ -113,17 +114,14 @@ FLASH_BANK_COMMAND_HANDLER(max32xxx_flash_bank_command)
        return ERROR_OK;
 }
 
-static int get_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
-       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");
-       buf += printed;
-       buf_size -= printed;
+       command_print_sameline(cmd, "\nMaxim Integrated max32xxx flash driver\n");
        return ERROR_OK;
 }
 
@@ -209,21 +207,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 +232,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 +246,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 +262,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;
@@ -306,12 +303,10 @@ static int max32xxx_erase(struct flash_bank *bank, int first, int last)
                        max32xxx_flash_op_post(bank);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
-
-               bank->sectors[banknr].is_erased = 1;
        }
 
        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 +317,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 +329,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 +455,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) {
@@ -523,7 +518,7 @@ static int max32xxx_write(struct flash_bank *bank, const uint8_t *buffer,
                        } while ((--retry > 0) && (flsh_cn & FLSH_CN_PEND));
 
                        if (retry <= 0) {
-                               LOG_ERROR("Timed out waiting for flash write @ 0x%08x", address);
+                               LOG_ERROR("Timed out waiting for flash write @ 0x%08" PRIx32, address);
                                return ERROR_FLASH_OPERATION_FAILED;
                        }
 
@@ -544,7 +539,7 @@ static int max32xxx_write(struct flash_bank *bank, const uint8_t *buffer,
 
                while (remaining >= 16) {
                        if ((address & 0xFFF) == 0)
-                               LOG_DEBUG("Writing @ 0x%08x", address);
+                               LOG_DEBUG("Writing @ 0x%08" PRIx32, address);
 
                        target_write_buffer(target, info->flc_base + FLSH_DATA0, 16, buffer);
                        flsh_cn |= 0x00000001;
@@ -557,7 +552,7 @@ static int max32xxx_write(struct flash_bank *bank, const uint8_t *buffer,
                        } while ((--retry > 0) && (flsh_cn & FLSH_CN_PEND));
 
                        if (retry <= 0) {
-                               LOG_ERROR("Timed out waiting for flash write @ 0x%08x", address);
+                               LOG_ERROR("Timed out waiting for flash write @ 0x%08" PRIx32, address);
                                return ERROR_FLASH_OPERATION_FAILED;
                        }
 
@@ -588,7 +583,7 @@ static int max32xxx_write(struct flash_bank *bank, const uint8_t *buffer,
                        } while ((--retry > 0) && (flsh_cn & FLSH_CN_PEND));
 
                        if (retry <= 0) {
-                               LOG_ERROR("Timed out waiting for flash write @ 0x%08x", address);
+                               LOG_ERROR("Timed out waiting for flash write @ 0x%08" PRIx32, address);
                                return ERROR_FLASH_OPERATION_FAILED;
                        }
 
@@ -626,7 +621,7 @@ static int max32xxx_write(struct flash_bank *bank, const uint8_t *buffer,
                } while ((--retry > 0) && (flsh_cn & FLSH_CN_PEND));
 
                if (retry <= 0) {
-                       LOG_ERROR("Timed out waiting for flash write @ 0x%08x", address);
+                       LOG_ERROR("Timed out waiting for flash write @ 0x%08" PRIx32, address);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
        }
@@ -634,7 +629,7 @@ static int max32xxx_write(struct flash_bank *bank, const uint8_t *buffer,
        /* Check access violations */
        target_read_u32(target, info->flc_base + FLSH_INT, &flsh_int);
        if (flsh_int & FLSH_INT_AF) {
-               LOG_ERROR("Flash Error writing 0x%x bytes at 0x%08x", count, offset);
+               LOG_ERROR("Flash Error writing 0x%" PRIx32 " bytes at 0x%08" PRIx32, count, offset);
                max32xxx_flash_op_post(bank);
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -652,17 +647,14 @@ static int max32xxx_probe(struct flash_bank *bank)
        uint32_t arm_id[2];
        uint16_t arm_pid;
 
-       if (bank->sectors) {
-               free(bank->sectors);
-               bank->sectors = NULL;
-       }
+       free(bank->sectors);
 
        /* provide this for the benefit of the NOR flash framework */
        bank->size = info->flash_size;
        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;
@@ -679,7 +671,7 @@ static int max32xxx_probe(struct flash_bank *bank)
        if ((arm_pid == ARM_PID_DEFAULT_CM3) || arm_pid == ARM_PID_DEFAULT_CM4) {
                uint32_t max326xx_id;
                target_read_u32(target, MAX326XX_ID_REG, &max326xx_id);
-               LOG_DEBUG("max326xx_id = 0x%x", max326xx_id);
+               LOG_DEBUG("max326xx_id = 0x%" PRIx32, max326xx_id);
                max326xx_id = ((max326xx_id & 0xFF000000) >> 24);
                if (max326xx_id == MAX326XX_ID)
                        info->max326xx = 1;
@@ -690,7 +682,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 +701,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,26 +759,21 @@ 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;
        }
 
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
-       if (max32xxx_mass_erase(bank) == ERROR_OK) {
-               /* set all sectors as erased */
-               for (i = 0; i < bank->num_sectors; i++)
-                       bank->sectors[i].is_erased = 1;
-
-               command_print(CMD_CTX, "max32xxx mass erase complete");
-       } else
-               command_print(CMD_CTX, "max32xxx mass erase failed");
+       if (max32xxx_mass_erase(bank) == ERROR_OK)
+               command_print(CMD, "max32xxx mass erase complete");
+       else
+               command_print(CMD, "max32xxx mass erase failed");
 
        return ERROR_OK;
 }
@@ -799,27 +786,27 @@ 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;
        }
 
        retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
        info = bank->driver_priv;
 
        /* Convert the range to the page numbers */
-       if (1 != sscanf(CMD_ARGV[1], "0x%"SCNx32, &addr)) {
+       if (sscanf(CMD_ARGV[1], "0x%"SCNx32, &addr) != 1) {
                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 */
        addr = (addr & 0x0FFFFFFF);
 
-       if (1 != sscanf(CMD_ARGV[2], "0x%"SCNx32, &len)) {
+       if (sscanf(CMD_ARGV[2], "0x%"SCNx32, &len) != 1) {
                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 +827,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,27 +842,27 @@ 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;
        }
 
        retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
        info = bank->driver_priv;
 
        /* Convert the range to the page numbers */
-       if (1 != sscanf(CMD_ARGV[1], "0x%"SCNx32, &addr)) {
+       if (sscanf(CMD_ARGV[1], "0x%"SCNx32, &addr) != 1) {
                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 */
        addr = (addr & 0x0FFFFFFF);
 
-       if (1 != sscanf(CMD_ARGV[2], "0x%"SCNx32, &len)) {
+       if (sscanf(CMD_ARGV[2], "0x%"SCNx32, &len) != 1) {
                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 +883,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,27 +895,26 @@ 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;
        }
 
        retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
        info = bank->driver_priv;
 
        /* Update the protection array */
        retval = max32xxx_protect_check(bank);
-       if (ERROR_OK != retval) {
+       if (retval != ERROR_OK) {
                LOG_WARNING("Error updating the protection array");
                return retval;
        }
 
        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,
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)