LPC2000: rename "r13_svc" as "sp_svc"

[openocd] / src / flash / nor / str9x.c

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index 98f15e75b4bf7d8d8337b27e70dc7b084fd866e5..9cddb5063f301af8f9a92e4915d8d149d668d0cc 100644 (file)
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -27,9 +27,10 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "str9x.h"
-#include "arm966e.h"
-#include "algorithm.h"
+#include <target/arm966e.h>
+#include <target/algorithm.h>
 
 
 static uint32_t bank1start = 0x00080000;
@@ -355,7 +356,7 @@ static int str9x_write_block(struct flash_bank *bank,
        struct working_area *source;
        uint32_t address = bank->base + offset;
        struct reg_param reg_params[4];
-       struct armv4_5_algorithm armv4_5_info;
+       struct arm_algorithm armv4_5_info;
        int retval = ERROR_OK;
 
        uint32_t str9x_flash_write_code[] = {
@@ -407,9 +408,9 @@ static int str9x_write_block(struct flash_bank *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;
 
        init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
        init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);