armv7m.h: relax dependency from 'arm_adi_v5.h'

[openocd.git] / src / flash / nor / bluenrg-x.c

diff --git a/src/flash/nor/bluenrg-x.c b/src/flash/nor/bluenrg-x.c
index f7f5e6370967bf4fa444dcad4bf9ce3fbe0c99a1..60eccefaf04baeb3326d508919b2fe2d7426b385 100644 (file)
--- a/src/flash/nor/bluenrg-x.c
+++ b/src/flash/nor/bluenrg-x.c
@@ -20,6 +20,8 @@
 #include "config.h"
 #endif
 
+#include <helper/binarybuffer.h>
+#include "helper/types.h"
 #include <target/algorithm.h>
 #include <target/armv7m.h>
 #include <target/cortex_m.h>
@@ -43,7 +45,7 @@ struct flash_ctrl_priv_data {
        char *part_name;
 };
 
-const struct flash_ctrl_priv_data flash_priv_data_1 = {
+static const struct flash_ctrl_priv_data flash_priv_data_1 = {
        .die_id_reg = 0x4090001C,
        .jtag_idcode_reg = 0x40900028,
        .flash_base = 0x10040000,
@@ -53,7 +55,7 @@ const struct flash_ctrl_priv_data flash_priv_data_1 = {
        .part_name = "BLUENRG-1",
 };
 
-const struct flash_ctrl_priv_data flash_priv_data_2 = {
+static const struct flash_ctrl_priv_data flash_priv_data_2 = {
        .die_id_reg = 0x4090001C,
        .jtag_idcode_reg = 0x40900028,
        .flash_base = 0x10040000,
@@ -63,7 +65,7 @@ const struct flash_ctrl_priv_data flash_priv_data_2 = {
        .part_name = "BLUENRG-2",
 };
 
-const struct flash_ctrl_priv_data flash_priv_data_lp = {
+static const struct flash_ctrl_priv_data flash_priv_data_lp = {
        .die_id_reg = 0x40000000,
        .jtag_idcode_reg = 0x40000004,
        .flash_base = 0x10040000,
@@ -74,12 +76,16 @@ const struct flash_ctrl_priv_data flash_priv_data_lp = {
 };
 
 struct bluenrgx_flash_bank {
-       int probed;
+       bool probed;
        uint32_t die_id;
        const struct flash_ctrl_priv_data *flash_ptr;
 };
 
-const struct flash_ctrl_priv_data *flash_ctrl[] = {&flash_priv_data_1, &flash_priv_data_2, &flash_priv_data_lp};
+static const struct flash_ctrl_priv_data *flash_ctrl[] = {
+       &flash_priv_data_1,
+       &flash_priv_data_2,
+       &flash_priv_data_lp
+};
 
 /* flash_bank bluenrg-x 0 0 0 0 <target#> */
 FLASH_BANK_COMMAND_HANDLER(bluenrgx_flash_bank_command)
@@ -89,7 +95,7 @@ FLASH_BANK_COMMAND_HANDLER(bluenrgx_flash_bank_command)
        bluenrgx_info = calloc(1, sizeof(*bluenrgx_info));
 
        /* Check allocation */
-       if (bluenrgx_info == NULL) {
+       if (!bluenrgx_info) {
                LOG_ERROR("failed to allocate bank structure");
                return ERROR_FAIL;
        }
@@ -99,7 +105,7 @@ FLASH_BANK_COMMAND_HANDLER(bluenrgx_flash_bank_command)
 
        bank->driver_priv = bluenrgx_info;
 
-       bluenrgx_info->probed = 0;
+       bluenrgx_info->probed = false;
 
        if (CMD_ARGC < 6)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -123,17 +129,18 @@ static inline int bluenrgx_write_flash_reg(struct flash_bank *bank, uint32_t reg
        return target_write_u32(bank->target, bluenrgx_get_flash_reg(bank, reg_offset), value);
 }
 
-static int bluenrgx_erase(struct flash_bank *bank, int first, int last)
+static int bluenrgx_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        int retval = ERROR_OK;
        struct bluenrgx_flash_bank *bluenrgx_info = bank->driver_priv;
-       int num_sectors = (last - first + 1);
-       int mass_erase = (num_sectors == bank->num_sectors);
+       unsigned int num_sectors = (last - first + 1);
+       const bool mass_erase = (num_sectors == bank->num_sectors);
        struct target *target = bank->target;
        uint32_t address, command;
 
        /* check preconditions */
-       if (bluenrgx_info->probed == 0)
+       if (!bluenrgx_info->probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        if (bank->target->state != TARGET_HALTED) {
@@ -165,7 +172,7 @@ static int bluenrgx_erase(struct flash_bank *bank, int first, int last)
                        return ERROR_FAIL;
                }
 
-               for (int i = 0; i < 100; i++) {
+               for (unsigned int i = 0; i < 100; i++) {
                        uint32_t value;
                        if (bluenrgx_read_flash_reg(bank, FLASH_REG_IRQRAW, &value)) {
                                LOG_ERROR("Register write failed");
@@ -181,9 +188,9 @@ static int bluenrgx_erase(struct flash_bank *bank, int first, int last)
 
        } else {
                command = FLASH_CMD_ERASE_PAGE;
-               for (int i = first; i <= last; i++) {
+               for (unsigned int i = first; i <= last; i++) {
                        address = bank->base+i*FLASH_PAGE_SIZE(bluenrgx_info);
-                       LOG_DEBUG("address = %08x, index = %d", address, i);
+                       LOG_DEBUG("address = %08" PRIx32 ", index = %u", address, i);
 
                        if (bluenrgx_write_flash_reg(bank, FLASH_REG_IRQRAW, 0x3f) != ERROR_OK) {
                                LOG_ERROR("Register write failed");
@@ -201,7 +208,7 @@ static int bluenrgx_erase(struct flash_bank *bank, int first, int last)
                                return ERROR_FAIL;
                        }
 
-                       for (int j = 0; j < 100; j++) {
+                       for (unsigned int j = 0; j < 100; j++) {
                                uint32_t value;
                                if (bluenrgx_read_flash_reg(bank, FLASH_REG_IRQRAW, &value)) {
                                        LOG_ERROR("Register write failed");
@@ -244,11 +251,11 @@ static int bluenrgx_write(struct flash_bank *bank, const uint8_t *buffer,
        };
 
        /* check preconditions */
-       if (bluenrgx_info->probed == 0)
+       if (!bluenrgx_info->probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        if ((offset + count) > bank->size) {
-               LOG_ERROR("Requested write past beyond of flash size: (offset+count) = %d, size=%d",
+               LOG_ERROR("Requested write past beyond of flash size: (offset+count) = %" PRIu32 ", size=%" PRIu32,
                          (offset + count),
                          bank->size);
                return ERROR_FLASH_DST_OUT_OF_BANK;
@@ -311,8 +318,8 @@ static int bluenrgx_write(struct flash_bank *bank, const uint8_t *buffer,
        LOG_DEBUG("source->address = " TARGET_ADDR_FMT, source->address);
        LOG_DEBUG("source->address+ source->size = " TARGET_ADDR_FMT, source->address+source->size);
        LOG_DEBUG("write_algorithm_sp->address = " TARGET_ADDR_FMT, write_algorithm_sp->address);
-       LOG_DEBUG("address = %08x", address);
-       LOG_DEBUG("count = %08x", count);
+       LOG_DEBUG("address = %08" PRIx32, address);
+       LOG_DEBUG("count = %08" PRIx32, count);
 
        retval = target_run_flash_async_algorithm(target,
                                                  buffer,
@@ -365,7 +372,6 @@ static int bluenrgx_probe(struct flash_bank *bank)
 {
        struct bluenrgx_flash_bank *bluenrgx_info = bank->driver_priv;
        uint32_t idcode, size_info, die_id;
-       int i;
        int retval = target_read_u32(bank->target, BLUENRGLP_JTAG_REG, &idcode);
 
        if (retval != ERROR_OK)
@@ -381,7 +387,7 @@ static int bluenrgx_probe(struct flash_bank *bank)
        bluenrgx_info->flash_ptr = &flash_priv_data_1;
        bank->base = flash_priv_data_1.flash_base;
 
-       for (i = 0; i < (int)(sizeof(flash_ctrl)/sizeof(*flash_ctrl)); i++) {
+       for (size_t i = 0; i < ARRAY_SIZE(flash_ctrl); i++) {
                if (idcode == (*flash_ctrl[i]).jtag_idcode) {
                        bluenrgx_info->flash_ptr = flash_ctrl[i];
                        bank->base = (*flash_ctrl[i]).flash_base;
@@ -400,14 +406,14 @@ static int bluenrgx_probe(struct flash_bank *bank)
        bank->num_sectors = bank->size/FLASH_PAGE_SIZE(bluenrgx_info);
        bank->sectors = realloc(bank->sectors, sizeof(struct flash_sector) * bank->num_sectors);
 
-       for (i = 0; i < bank->num_sectors; i++) {
+       for (unsigned int i = 0; i < bank->num_sectors; i++) {
                bank->sectors[i].offset = i * FLASH_PAGE_SIZE(bluenrgx_info);
                bank->sectors[i].size = FLASH_PAGE_SIZE(bluenrgx_info);
                bank->sectors[i].is_erased = -1;
                bank->sectors[i].is_protected = 0;
        }
 
-       bluenrgx_info->probed = 1;
+       bluenrgx_info->probed = true;
        bluenrgx_info->die_id = die_id;
 
        return ERROR_OK;
@@ -424,7 +430,7 @@ static int bluenrgx_auto_probe(struct flash_bank *bank)
 }
 
 /* This method must return a string displaying information about the bank */
-static int bluenrgx_get_info(struct flash_bank *bank, char *buf, int buf_size)
+static int bluenrgx_get_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        struct bluenrgx_flash_bank *bluenrgx_info = bank->driver_priv;
        int mask_number, cut_number;
@@ -432,8 +438,7 @@ static int bluenrgx_get_info(struct flash_bank *bank, char *buf, int buf_size)
        if (!bluenrgx_info->probed) {
                int retval = bluenrgx_probe(bank);
                if (retval != ERROR_OK) {
-                       snprintf(buf, buf_size,
-                                "Unable to find bank information.");
+                       command_print_sameline(cmd, "Unable to find bank information.");
                        return retval;
                }
        }
@@ -441,8 +446,8 @@ static int bluenrgx_get_info(struct flash_bank *bank, char *buf, int buf_size)
        mask_number = (bluenrgx_info->die_id >> 4) & 0xF;
        cut_number = bluenrgx_info->die_id & 0xF;
 
-       snprintf(buf, buf_size,
-                "%s - Rev: %d.%d", bluenrgx_info->flash_ptr->part_name, mask_number, cut_number);
+       command_print_sameline(cmd, "%s - Rev: %d.%d",
+                       bluenrgx_info->flash_ptr->part_name, mask_number, cut_number);
        return ERROR_OK;
 }