ioutil: make the file compile on MacOS

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

diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index 616627a42140f5c541fc407f912295b261adb9e9..38ba4d46bcc23a1b67e3576bdfec697ba50bd46c 100644 (file)
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -17,31 +17,25 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef ARM_SIMULATOR_H
 #define ARM_SIMULATOR_H
 
-#include "types.h"
-
 struct target;
 
-struct arm_sim_interface
-{
+struct arm_sim_interface {
        void *user_data;
        uint32_t (*get_reg)(struct arm_sim_interface *sim, int reg);
        void (*set_reg)(struct arm_sim_interface *sim, int reg, uint32_t value);
        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 *target, uint32_t *dry_run_pc);
 
-/* a generic arm simulator. Caller must implement the sim interface */
-int arm_simulate_step_core(struct target *target,
-               uint32_t *dry_run_pc, struct arm_sim_interface *sim);
-
 #endif /* ARM_SIMULATOR_H */