Remove unnecessary (void *)

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

diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index 9e7b0400c76aefb8c807a4aa2138103f88a498b0..3aedaee2e8da205c5f7617282ffd1f4621a7b3d1 100644 (file)
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -15,33 +15,27 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef ARM_SIMULATOR_H
 #define ARM_SIMULATOR_H
 
-#include "types.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 */
-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 */