flash/nor: make all working area pointers local

[openocd.git] / src / flash / nor / fm3.c

diff --git a/src/flash/nor/fm3.c b/src/flash/nor/fm3.c
index 9f9695e75d4f27f9694a04b7180a53a81c7caefb..224090db8c1f1a6d2570f2a51810b05d956dbf8b 100644 (file)
--- a/src/flash/nor/fm3.c
+++ b/src/flash/nor/fm3.c
@@ -31,8 +31,7 @@
 #define FLASH_DQ6 0x00000040   /* Data toggle flag bit (TOGG) position */
 #define FLASH_DQ5 0x00000020   /* Time limit exceeding flag bit (TLOV) position */
 
-enum fm3_variant
-{
+enum fm3_variant {
        mb9bfxx1,       /* Flash Type '1' */
        mb9bfxx2,
        mb9bfxx3,
@@ -47,16 +46,13 @@ enum fm3_variant
        mb9afxx6
 };
 
-enum fm3_flash_type
-{
+enum fm3_flash_type {
        fm3_no_flash_type = 0,
        fm3_flash_type1   = 1,
        fm3_flash_type2   = 2
 };
 
-struct fm3_flash_bank
-{
-       struct working_area *write_algorithm;
+struct fm3_flash_bank {
        enum fm3_variant variant;
        enum fm3_flash_type flashtype;
        int probed;
@@ -118,7 +114,6 @@ FLASH_BANK_COMMAND_HANDLER(fm3_flash_bank_command)
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       fm3_info->write_algorithm = NULL;
        fm3_info->probed = 0;
 
        return ERROR_OK;
@@ -285,6 +280,7 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer,
        struct fm3_flash_bank *fm3_info = bank->driver_priv;
        struct target *target = bank->target;
        uint32_t buffer_size = 2048;            /* 8192 for MB9Bxx6! */
+       struct working_area *write_algorithm;
        struct working_area *source;
        uint32_t address = bank->base + offset;
        struct reg_param reg_params[6];
@@ -464,12 +460,12 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer,
 
        /* allocate working area with flash programming code */
        if (target_alloc_working_area(target, sizeof(fm3_flash_write_code),
-                       &fm3_info->write_algorithm) != ERROR_OK) {
+                       &write_algorithm) != ERROR_OK) {
                LOG_WARNING("no working area available, can't do block memory writes");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
 
-       retval = target_write_buffer(target, fm3_info->write_algorithm->address,
+       retval = target_write_buffer(target, write_algorithm->address,
                sizeof(fm3_flash_write_code), fm3_flash_write_code);
        if (retval != ERROR_OK)
                return retval;
@@ -480,9 +476,8 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer,
        while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) {
                buffer_size /= 2;
                if (buffer_size <= 256) {
-                       /* free working area, if write algorithm already allocated */
-                       if (fm3_info->write_algorithm)
-                               target_free_working_area(target, fm3_info->write_algorithm);
+                       /* free working area, write algorithm already allocated */
+                       target_free_working_area(target, write_algorithm);
 
                        LOG_WARNING("No large enough working area available, can't do block memory writes");
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -504,22 +499,22 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer,
        while (count > 0) {
                uint32_t thisrun_count = (count > (buffer_size / 2)) ? (buffer_size / 2) : count;
 
-               retval = target_write_buffer(target, fm3_info->write_algorithm->address, 8,
+               retval = target_write_buffer(target, write_algorithm->address, 8,
                                fm3_flash_write_code);
                if (retval != ERROR_OK)
                        break;
 
                /* Patching 'local variable address' for different RAM addresses */
-               if (fm3_info->write_algorithm->address != 0x1FFF8008) {
+               if (write_algorithm->address != 0x1FFF8008) {
                        /* Algorithm: u32DummyRead: */
-                       retval = target_write_u32(target, (fm3_info->write_algorithm->address)
-                               + sizeof(fm3_flash_write_code) - 8, (fm3_info->write_algorithm->address) - 8);
+                       retval = target_write_u32(target, (write_algorithm->address)
+                               + sizeof(fm3_flash_write_code) - 8, (write_algorithm->address) - 8);
                        if (retval != ERROR_OK)
                                break;
 
                        /* Algorithm: u32FlashResult: */
-                       retval = target_write_u32(target, (fm3_info->write_algorithm->address)
-                               + sizeof(fm3_flash_write_code) - 4, (fm3_info->write_algorithm->address) - 4);
+                       retval = target_write_u32(target, (write_algorithm->address)
+                               + sizeof(fm3_flash_write_code) - 4, (write_algorithm->address) - 4);
                        if (retval != ERROR_OK)
                                break;
                }
@@ -535,7 +530,7 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer,
                buf_set_u32(reg_params[4].value, 0, 32, u32FlashSeqAddress2);
 
                retval = target_run_algorithm(target, 0, NULL, 6, reg_params,
-                               fm3_info->write_algorithm->address, 0, 1000, &armv7m_info);
+                               write_algorithm->address, 0, 1000, &armv7m_info);
                if (retval != ERROR_OK) {
                        LOG_ERROR("Error executing fm3 Flash programming algorithm");
                        retval = ERROR_FLASH_OPERATION_FAILED;
@@ -555,7 +550,7 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer,
        }
 
        target_free_working_area(target, source);
-       target_free_working_area(target, fm3_info->write_algorithm);
+       target_free_working_area(target, write_algorithm);
 
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
@@ -582,7 +577,6 @@ static int fm3_probe(struct flash_bank *bank)
 
        bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
        bank->base = 0x00000000;
-       num_pages = 2;                          /* start with smallest Flash pages number */
        bank->size = 32 * 1024;         /* bytes */
 
        bank->sectors[0].offset = 0;
@@ -826,6 +820,6 @@ struct flash_driver fm3_flash = {
        .write = fm3_write_block,
        .probe = fm3_probe,
        .auto_probe = fm3_auto_probe,
-       .erase_check = default_flash_mem_blank_check,
+       .erase_check = default_flash_blank_check,
        .info = fm3_info,
 };