reg_t -> struct reg

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

diff --git a/src/target/target_type.h b/src/target/target_type.h
index 23ed40e04e494fa0787ddd675bf43cf37687cb49..37e438deea41216b0b1e2093deb5176f17a2cdc4 100644 (file)
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -30,7 +30,7 @@
 
 struct target_s;
 
-struct target_type_s
+struct target_type
 {
        /**
         * Name of the target.  Do @b not access this field directly, use
@@ -91,7 +91,7 @@ struct target_type_s
         * list, however it is after GDB is connected that monitor commands can
         * be run to properly initialize the target
         */
-       int (*get_gdb_reg_list)(struct target_s *target, struct reg_s **reg_list[], int *reg_list_size);
+       int (*get_gdb_reg_list)(struct target_s *target, struct reg **reg_list[], int *reg_list_size);
 
        /* target memory access
        * size: 1 = byte (8bit), 2 = half-word (16bit), 4 = word (32bit)
@@ -131,25 +131,25 @@ struct target_type_s
         *
         * Upon GDB connection all breakpoints/watchpoints are cleared.
         */
-       int (*add_breakpoint)(struct target_s *target, breakpoint_t *breakpoint);
+       int (*add_breakpoint)(struct target_s *target, struct breakpoint *breakpoint);
 
        /* remove breakpoint. hw will only be updated if the target is currently halted.
         * However, this method can be invoked on unresponsive targets.
         */
-       int (*remove_breakpoint)(struct target_s *target, breakpoint_t *breakpoint);
-       int (*add_watchpoint)(struct target_s *target, watchpoint_t *watchpoint);
+       int (*remove_breakpoint)(struct target_s *target, struct breakpoint *breakpoint);
+       int (*add_watchpoint)(struct target_s *target, struct watchpoint *watchpoint);
        /* remove watchpoint. hw will only be updated if the target is currently halted.
         * However, this method can be invoked on unresponsive targets.
         */
-       int (*remove_watchpoint)(struct target_s *target, watchpoint_t *watchpoint);
+       int (*remove_watchpoint)(struct target_s *target, struct watchpoint *watchpoint);
 
        /* target algorithm support */
-       int (*run_algorithm_imp)(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info);
+       int (*run_algorithm_imp)(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info);
        /**
         * Target algorithm support.  Do @b not call this method directly,
         * use target_run_algorithm() instead.
         */
-       int (*run_algorithm)(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info);
+       int (*run_algorithm)(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info);
 
        int (*register_commands)(struct command_context_s *cmd_ctx);
 
@@ -199,16 +199,8 @@ struct target_type_s
         */
        int (*write_phys_memory)(struct target_s *target, uint32_t phys_address, uint32_t size, uint32_t count, uint8_t *buffer);
 
-       /* returns true if the mmu is enabled. Default implementation returns error. */
        int (*mmu)(struct target_s *target, int *enabled);
 
-       /* returns true if the target has an mmu. This can only be
-       determined after the target has been examined.
-       
-       Default implementation returns success and has_mmu==true.
-       */
-       int (*has_mmu)(struct target_s *target, bool *has_mmu);
-
        /* Read coprocessor - arm specific. Default implementation returns error. */
        int (*mrc)(struct target_s *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value);