X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_simulator.h;h=5bdbf562cc33357866f32c1fccd3e80b72f81437;hp=bad904bac64b55249d0e1913bcb4dbca9e38a0e2;hb=420a692e0fae34a59eb3c33932362812e33f5583;hpb=32a2c70d3e05bf037b655ff80edcdc2637133650

diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index bad904bac6..5bdbf562cc 100644
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -13,36 +13,27 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef ARM_SIMULATOR_H
-#define ARM_SIMULATOR_H
 
-#include "types.h"
+#ifndef OPENOCD_TARGET_ARM_SIMULATOR_H
+#define OPENOCD_TARGET_ARM_SIMULATOR_H
 
-struct target_s;
+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 */
-extern int arm_simulate_step(struct target_s *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(struct target *target, uint32_t *dry_run_pc);
 
-#endif /* ARM_SIMULATOR_H */
+#endif /* OPENOCD_TARGET_ARM_SIMULATOR_H */