NOR: cleanup driver decls

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

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 043d74206f2224ec6c7c372fad69bafb2ebf9ba9..42aa294777a68427b40bf601072727064fa30159 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -23,9 +23,10 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "cfi.h"
 #include "non_cfi.h"
-#include "armv4_5.h"
+#include <target/arm.h>
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
 
@@ -1011,7 +1012,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer, uint3
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
        struct target *target = bank->target;
        struct reg_param reg_params[7];
-       struct armv4_5_algorithm armv4_5_info;
+       struct arm_algorithm armv4_5_info;
        struct working_area *source;
        uint32_t buffer_size = 32768;
        uint32_t write_command_val, busy_pattern_val, error_pattern_val;
@@ -1084,9 +1085,9 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer, uint3
 
        cfi_intel_clear_status_register(bank);
 
-       armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
-       armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
-       armv4_5_info.core_state = ARMV4_5_STATE_ARM;
+       armv4_5_info.common_magic = ARM_COMMON_MAGIC;
+       armv4_5_info.core_mode = ARM_MODE_SVC;
+       armv4_5_info.core_state = ARM_STATE_ARM;
 
        /* If we are setting up the write_algorith, we need target_code_src */
        /* if not we only need target_code_size. */
@@ -1256,7 +1257,7 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer, ui
        struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        struct target *target = bank->target;
        struct reg_param reg_params[10];
-       struct armv4_5_algorithm armv4_5_info;
+       struct arm_algorithm armv4_5_info;
        struct working_area *source;
        uint32_t buffer_size = 32768;
        uint32_t status;
@@ -1407,9 +1408,9 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer, ui
                0xeafffffe      /* b    8204 <sp_8_done>               */
        };
 
-       armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
-       armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
-       armv4_5_info.core_state = ARMV4_5_STATE_ARM;
+       armv4_5_info.common_magic = ARM_COMMON_MAGIC;
+       armv4_5_info.core_mode = ARM_MODE_SVC;
+       armv4_5_info.core_state = ARM_STATE_ARM;
 
        int target_code_size;
        const uint32_t *target_code_src;
@@ -2617,14 +2618,14 @@ static int cfi_info(struct flash_bank *bank, char *buf, int buf_size)
 }
 
 struct flash_driver cfi_flash = {
-               .name = "cfi",
-               .flash_bank_command = &cfi_flash_bank_command,
-               .erase = &cfi_erase,
-               .protect = &cfi_protect,
-               .write = &cfi_write,
-               .probe = &cfi_probe,
-               .auto_probe = &cfi_auto_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &cfi_protect_check,
-               .info = &cfi_info,
-       };
+       .name = "cfi",
+       .flash_bank_command = cfi_flash_bank_command,
+       .erase = cfi_erase,
+       .protect = cfi_protect,
+       .write = cfi_write,
+       .probe = cfi_probe,
+       .auto_probe = cfi_auto_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = cfi_protect_check,
+       .info = cfi_info,
+};