X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_simulator.h;h=b332a174127593044532c636a8fdd7f746442d86;hp=9e7b0400c76aefb8c807a4aa2138103f88a498b0;hb=559d08c19ed838f7bb2a77ce56a5a274641111f8;hpb=3885ab5a5af7ece410ce3eeb1059da3ea950436a

diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index 9e7b0400c7..b332a17412 100644
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -20,9 +20,9 @@
 #ifndef ARM_SIMULATOR_H
 #define ARM_SIMULATOR_H
 
-#include "types.h"
+#include <helper/types.h>
 
-struct target_s;
+struct target;
 
 struct arm_sim_interface
 {
@@ -32,16 +32,12 @@ 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 */
-int arm_simulate_step(struct target_s *target, uint32_t *dry_run_pc);
-
-/* a generic arm simulator. Caller must implement the sim interface */
-int arm_simulate_step_core(target_t *target,
-		uint32_t *dry_run_pc, struct arm_sim_interface *sim);
+int arm_simulate_step(struct target *target, uint32_t *dry_run_pc);
 
 #endif /* ARM_SIMULATOR_H */