armv4_5_common_t -> struct arm

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

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 2059bd06514044c591777ff5b64f85c0059cedaf..41858c6840f83bd64025e8ddf5667ecf2569c264 100644 (file)
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -42,8 +42,8 @@ struct arm7_9_common
        struct arm armv4_5_common;
        uint32_t common_magic;
 
-       arm_jtag_t jtag_info; /**< JTAG information for target */
-       reg_cache_t *eice_cache; /**< Embedded ICE register cache */
+       struct arm_jtag jtag_info; /**< JTAG information for target */
+       struct reg_cache *eice_cache; /**< Embedded ICE register cache */
 
        uint32_t arm_bkpt; /**< ARM breakpoint instruction */
        uint16_t thumb_bkpt; /**< Thumb breakpoint instruction */
@@ -69,7 +69,7 @@ struct arm7_9_common
        bool fast_memory_access;
        bool dcc_downloads;
 
-       struct working_area_s *dcc_working_area;
+       struct working_area *dcc_working_area;
 
        int (*examine_debug_reason)(target_t *target); /**< Function for determining why debug state was entered */
 
@@ -143,10 +143,10 @@ int arm7_9_blank_check_memory(struct target_s *target, uint32_t address, uint32_
 
 int arm7_9_run_algorithm(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_prams, struct reg_param *reg_param, uint32_t entry_point, void *arch_info);
 
-int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
-int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
-int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
-int arm7_9_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
+int arm7_9_add_breakpoint(struct target_s *target, struct breakpoint *breakpoint);
+int arm7_9_remove_breakpoint(struct target_s *target, struct breakpoint *breakpoint);
+int arm7_9_add_watchpoint(struct target_s *target, struct watchpoint *watchpoint);
+int arm7_9_remove_watchpoint(struct target_s *target, struct watchpoint *watchpoint);
 
 void arm7_9_enable_eice_step(target_t *target, uint32_t next_pc);
 void arm7_9_disable_eice_step(target_t *target);
@@ -154,6 +154,6 @@ void arm7_9_disable_eice_step(target_t *target);
 int arm7_9_execute_sys_speed(struct target_s *target);
 
 int arm7_9_init_arch_info(target_t *target, struct arm7_9_common *arm7_9);
-int arm7_9_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p, struct arm7_9_common **arm7_9_p);
+int arm7_9_get_arch_pointers(target_t *target, struct arm **armv4_5_p, struct arm7_9_common **arm7_9_p);
 
 #endif /* ARM7_9_COMMON_H */