projects / fw / openocd / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
stm32l4x: cosmetic simplification of get_stm32l4_info
[fw/openocd] / src / flash / nor / esirisc_flash.c
diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c
index 8ecd27ae8d099af5f1b2672fb3c54c64e048b5c6..88f00bccaa6a0a676a5adcfb2d5232a75ee4bfe3 100644 (file)
--- a/src/flash/nor/esirisc_flash.c
+++ b/src/flash/nor/esirisc_flash.c
@@ -92,7 +92,7 @@
 #endif
 
 #define CONTROL_TIMEOUT                5000            /* 5s    */
-#define PAGE_SIZE                      4096
+#define FLASH_PAGE_SIZE                4096
 #define PB_MAX                         32
 
 #define NUM_NS_PER_S           1000000000ULL
@@ -156,7 +156,7 @@ static int esirisc_flash_disable_protect(struct flash_bank *bank)
        if (!(control & CONTROL_WP))
                return ERROR_OK;
 
-       esirisc_flash_unlock(bank);
+       (void)esirisc_flash_unlock(bank);
 
        control &= ~CONTROL_WP;
 
@@ -175,7 +175,7 @@ static int esirisc_flash_enable_protect(struct flash_bank *bank)
        if (control & CONTROL_WP)
                return ERROR_OK;
 
-       esirisc_flash_unlock(bank);
+       (void)esirisc_flash_unlock(bank);
 
        control |= CONTROL_WP;
 
@@ -252,7 +252,8 @@ static int esirisc_flash_recall(struct flash_bank *bank)
        return esirisc_flash_control(bank, CONTROL_R);
 }
 
-static int esirisc_flash_erase(struct flash_bank *bank, int first, int last)
+static int esirisc_flash_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct esirisc_flash_bank *esirisc_info = bank->driver_priv;
        struct target *target = bank->target;
@@ -261,10 +262,10 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last)
        if (target->state != TARGET_HALTED)
                return ERROR_TARGET_NOT_HALTED;
 
-       esirisc_flash_disable_protect(bank);
+       (void)esirisc_flash_disable_protect(bank);
 
-       for (int page = first; page < last; ++page) {
-               uint32_t address = page * PAGE_SIZE;
+       for (unsigned int page = first; page < last; ++page) {
+               uint32_t address = page * FLASH_PAGE_SIZE;
 
                target_write_u32(target, esirisc_info->cfg + ADDRESS, address);
 
@@ -275,7 +276,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last)
                }
        }
 
-       esirisc_flash_enable_protect(bank);
+       (void)esirisc_flash_enable_protect(bank);
 
        return retval;
 }
@@ -289,7 +290,7 @@ static int esirisc_flash_mass_erase(struct flash_bank *bank)
        if (target->state != TARGET_HALTED)
                return ERROR_TARGET_NOT_HALTED;
 
-       esirisc_flash_disable_protect(bank);
+       (void)esirisc_flash_disable_protect(bank);
 
        target_write_u32(target, esirisc_info->cfg + ADDRESS, 0);
 
@@ -297,7 +298,7 @@ static int esirisc_flash_mass_erase(struct flash_bank *bank)
        if (retval != ERROR_OK)
                LOG_ERROR("%s: failed to mass erase", bank->name);
 
-       esirisc_flash_enable_protect(bank);
+       (void)esirisc_flash_enable_protect(bank);
 
        return retval;
 }
@@ -315,32 +316,17 @@ static int esirisc_flash_ref_erase(struct flash_bank *bank)
        if (target->state != TARGET_HALTED)
                return ERROR_TARGET_NOT_HALTED;
 
-       esirisc_flash_disable_protect(bank);
+       (void)esirisc_flash_disable_protect(bank);
 
        retval = esirisc_flash_control(bank, CONTROL_ERC);
        if (retval != ERROR_OK)
                LOG_ERROR("%s: failed to erase reference cell", bank->name);
 
-       esirisc_flash_enable_protect(bank);
+       (void)esirisc_flash_enable_protect(bank);
 
        return retval;
 }
 
-static int esirisc_flash_protect(struct flash_bank *bank, int set, int first, int last)
-{
-       struct target *target = bank->target;
-
-       if (target->state != TARGET_HALTED)
-               return ERROR_TARGET_NOT_HALTED;
-
-       if (set)
-               esirisc_flash_enable_protect(bank);
-       else
-               esirisc_flash_disable_protect(bank);
-
-       return ERROR_OK;
-}
-
 static int esirisc_flash_fill_pb(struct flash_bank *bank,
                const uint8_t *buffer, uint32_t count)
 {
@@ -382,7 +368,7 @@ static int esirisc_flash_write(struct flash_bank *bank,
        if (target->state != TARGET_HALTED)
                return ERROR_TARGET_NOT_HALTED;
 
-       esirisc_flash_disable_protect(bank);
+       (void)esirisc_flash_disable_protect(bank);
 
        /*
         * The address register is auto-incremented based on the contents of
@@ -413,7 +399,7 @@ static int esirisc_flash_write(struct flash_bank *bank,
                count -= num_bytes;
        }
 
-       esirisc_flash_enable_protect(bank);
+       (void)esirisc_flash_enable_protect(bank);
 
        return retval;
 }
@@ -439,7 +425,7 @@ static int esirisc_flash_init(struct flash_bank *bank)
        uint32_t value;
        int retval;
 
-       esirisc_flash_disable_protect(bank);
+       (void)esirisc_flash_disable_protect(bank);
 
        /* initialize timing registers */
        value = TIMING0_F(esirisc_flash_num_cycles(bank, TNVH))
@@ -465,7 +451,7 @@ static int esirisc_flash_init(struct flash_bank *bank)
        if (retval != ERROR_OK)
                LOG_ERROR("%s: failed to recall trim code", bank->name);
 
-       esirisc_flash_enable_protect(bank);
+       (void)esirisc_flash_enable_protect(bank);
 
        return retval;
 }
@@ -479,15 +465,8 @@ static int esirisc_flash_probe(struct flash_bank *bank)
        if (target->state != TARGET_HALTED)
                return ERROR_TARGET_NOT_HALTED;
 
-       bank->num_sectors = bank->size / PAGE_SIZE;
-       bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors);
-
-       /*
-        * Register write protection is enforced using a single protection
-        * block for the entire bank. This is as good as it gets.
-        */
-       bank->num_prot_blocks = 1;
-       bank->prot_blocks = alloc_block_array(0, bank->size, bank->num_prot_blocks);
+       bank->num_sectors = bank->size / FLASH_PAGE_SIZE;
+       bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors);
 
        retval = esirisc_flash_init(bank);
        if (retval != ERROR_OK) {
@@ -510,29 +489,12 @@ static int esirisc_flash_auto_probe(struct flash_bank *bank)
        return esirisc_flash_probe(bank);
 }
 
-static int esirisc_flash_protect_check(struct flash_bank *bank)
-{
-       struct esirisc_flash_bank *esirisc_info = bank->driver_priv;
-       struct target *target = bank->target;
-       uint32_t control;
-
-       if (target->state != TARGET_HALTED)
-               return ERROR_TARGET_NOT_HALTED;
-
-       target_read_u32(target, esirisc_info->cfg + CONTROL, &control);
-
-       /* single protection block (also see: esirisc_flash_probe()) */
-       bank->prot_blocks[0].is_protected = !!(control & CONTROL_WP);
-
-       return ERROR_OK;
-}
-
 static int esirisc_flash_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        struct esirisc_flash_bank *esirisc_info = bank->driver_priv;
 
        snprintf(buf, buf_size,
-                       "%4s cfg at 0x%" PRIx32 ", clock %" PRId32 ", wait_states %" PRId32,
+                       "%4s cfg at 0x%" PRIx32 ", clock %" PRIu32 ", wait_states %" PRIu32,
                        "",     /* align with first line */
                        esirisc_info->cfg,
                        esirisc_info->clock,
@@ -555,7 +517,7 @@ COMMAND_HANDLER(handle_esirisc_flash_mass_erase_command)
 
        retval = esirisc_flash_mass_erase(bank);
 
-       command_print(CMD_CTX, "mass erase %s",
+       command_print(CMD, "mass erase %s",
                        (retval == ERROR_OK) ? "successful" : "failed");
 
        return retval;
@@ -575,7 +537,7 @@ COMMAND_HANDLER(handle_esirisc_flash_ref_erase_command)
 
        retval = esirisc_flash_ref_erase(bank);
 
-       command_print(CMD_CTX, "erase reference cell %s",
+       command_print(CMD, "erase reference cell %s",
                        (retval == ERROR_OK) ? "successful" : "failed");
 
        return retval;
@@ -610,19 +572,17 @@ static const struct command_registration esirisc_flash_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver esirisc_flash = {
+const struct flash_driver esirisc_flash = {
        .name = "esirisc",
        .usage = "flash bank bank_id 'esirisc' base_address size_bytes 0 0 target "
                        "cfg_address clock_hz wait_states",
        .flash_bank_command = esirisc_flash_bank_command,
        .erase = esirisc_flash_erase,
-       .protect = esirisc_flash_protect,
        .write = esirisc_flash_write,
        .read = default_flash_read,
        .probe = esirisc_flash_probe,
        .auto_probe = esirisc_flash_auto_probe,
        .erase_check = default_flash_blank_check,
-       .protect_check = esirisc_flash_protect_check,
        .info = esirisc_flash_info,
        .free_driver_priv = default_flash_free_driver_priv,
 };
openocd with support for Altus Metrum targets