armv4_5_algorithm_t -> struct armv4_5_algorithm

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

diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index a3187fe2752a922b88299434b47a3c04884e1c6a..c0c2cb79ddbd4dde5484ce4b845c488fd2694a0a 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -1020,8 +1020,8 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
 {
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
-       reg_param_t reg_params[7];
-       armv4_5_algorithm_t armv4_5_info;
+       struct reg_param reg_params[7];
+       struct armv4_5_algorithm armv4_5_info;
        working_area_t *source;
        uint32_t buffer_size = 32768;
        uint32_t write_command_val, busy_pattern_val, error_pattern_val;
@@ -1265,8 +1265,8 @@ static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer,
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
        struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
-       reg_param_t reg_params[10];
-       armv4_5_algorithm_t armv4_5_info;
+       struct reg_param reg_params[10];
+       struct armv4_5_algorithm armv4_5_info;
        working_area_t *source;
        uint32_t buffer_size = 32768;
        uint32_t status;
@@ -2626,7 +2626,7 @@ static int cfi_info(struct flash_bank_s *bank, char *buf, int buf_size)
        return ERROR_OK;
 }
 
-flash_driver_t cfi_flash = {
+struct flash_driver cfi_flash = {
                .name = "cfi",
                .register_commands = &cfi_register_commands,
                .flash_bank_command = &cfi_flash_bank_command,