reg_t -> struct reg

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

diff --git a/src/target/target.h b/src/target/target.h
index 3eafc18a30ec7f2db1fbf9e586acdfb3d30fd5e9..b2c908a82c349d9e759bbd9deeb756107084215e 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -32,7 +32,7 @@
 #include "algorithm.h"
 #include "command.h"
 
-struct reg_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 */
@@ -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.