split NOR and NAND flash headers

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

diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index bad904bac64b55249d0e1913bcb4dbca9e38a0e2..daca371170a872fdb880116d53e391286d8e315e 100644 (file)
--- 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
 {
@@ -37,12 +37,11 @@ struct arm_sim_interface
        enum armv4_5_mode (*get_mode)(struct arm_sim_interface *sim);
 };
 
-
 /* armv4_5 version */
-extern int arm_simulate_step(struct target_s *target, uint32_t *dry_run_pc);
+int arm_simulate_step(struct target *target, uint32_t *dry_run_pc);
 
 /* a generic arm simulator. Caller must implement the sim interface */
-extern int arm_simulate_step_core(target_t *target, uint32_t *dry_run_pc, struct arm_sim_interface *sim);
-
+int arm_simulate_step_core(struct target *target,
+               uint32_t *dry_run_pc, struct arm_sim_interface *sim);
 
 #endif /* ARM_SIMULATOR_H */