reg_t -> struct reg

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

diff --git a/src/target/target.h b/src/target/target.h
index e872ec6656ecfc30685ea994b73b29d84089e163..b2c908a82c349d9e759bbd9deeb756107084215e 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -32,8 +32,8 @@
 #include "algorithm.h"
 #include "command.h"
 
-struct reg_s;
-struct trace_s;
+struct reg;
+struct trace;
 struct command_context_s;
 
 
@@ -124,13 +124,10 @@ struct working_area
        struct working_area *next;
 };
 
-// target_type.h contains the full definitionof struct target_type_s
-struct target_type_s;
-typedef struct target_type_s target_type_t;
-
+// target_type.h contains the full definitionof struct target_type
 typedef struct target_s
 {
-       target_type_t *type;                            /* target type definition (name, access functions) */
+       struct target_type *type;                               /* target type definition (name, access functions) */
        const char *cmd_name;                           /* tcl Name of target */
        int target_number;                                      /* DO NOT USE!  field to be removed in 2010 */
        struct jtag_tap *tap;                                   /* where on the jtag chain is this */
@@ -152,9 +149,9 @@ typedef struct target_s
        // also see: target_state_name()
        enum target_state state;                        /* the current backend-state (running, halted, ...) */
        struct reg_cache *reg_cache;            /* the first register cache of the target (core regs) */
-       struct breakpoint_s *breakpoints;       /* list of breakpoints */
+       struct breakpoint *breakpoints; /* list of breakpoints */
        struct watchpoint *watchpoints; /* list of watchpoints */
-       struct trace_s *trace_info;                     /* generic trace information */
+       struct trace *trace_info;                       /* generic trace information */
        struct debug_msg_receiver *dbgmsg;/* list of debug message receivers */
        uint32_t dbg_msg_enabled;                               /* debug message status */
        void *arch_info;                                        /* architecture specific information */
@@ -313,14 +310,14 @@ void target_reset_examined(struct target_s *target);
  * This routine is a wrapper for target->type->add_breakpoint.
  */
 int target_add_breakpoint(struct target_s *target,
-               struct breakpoint_s *breakpoint);
+               struct breakpoint *breakpoint);
 /**
  * Remove the @a breakpoint for @a target.
  *
  * This routine is a wrapper for target->type->remove_breakpoint.
  */
 int target_remove_breakpoint(struct target_s *target,
-               struct breakpoint_s *breakpoint);
+               struct breakpoint *breakpoint);
 /**
  * Add the @a watchpoint for @a target.
  *
@@ -342,7 +339,7 @@ int target_remove_watchpoint(struct target_s *target,
  * This routine is a wrapper for target->type->get_gdb_reg_list.
  */
 int target_get_gdb_reg_list(struct target_s *target,
-               struct reg_s **reg_list[], int *reg_list_size);
+               struct reg **reg_list[], int *reg_list_size);
 
 /**
  * Step the target.