ARM: rename armv4_5_state_* as arm_state_*

[fw/openocd] / src / target / arm_simulator.h

diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index 616627a42140f5c541fc407f912295b261adb9e9..bd5458e409b1244fb50486c7f8f54b7e784cd1c6 100644 (file)
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -20,7 +20,7 @@
 #ifndef ARM_SIMULATOR_H
 #define ARM_SIMULATOR_H
 
-#include "types.h"
+#include <helper/types.h>
 
 struct target;
 
@@ -32,9 +32,9 @@ struct arm_sim_interface
        uint32_t (*get_reg_mode)(struct arm_sim_interface *sim, int reg);
        void (*set_reg_mode)(struct arm_sim_interface *sim, int reg, uint32_t value);
        uint32_t (*get_cpsr)(struct arm_sim_interface *sim, int pos, int bits);
-       enum armv4_5_state (*get_state)(struct arm_sim_interface *sim);
-       void (*set_state)(struct arm_sim_interface *sim, enum armv4_5_state mode);
-       enum armv4_5_mode (*get_mode)(struct arm_sim_interface *sim);
+       enum arm_state (*get_state)(struct arm_sim_interface *sim);
+       void (*set_state)(struct arm_sim_interface *sim, enum arm_state mode);
+       enum arm_mode (*get_mode)(struct arm_sim_interface *sim);
 };
 
 /* armv4_5 version */