target_type_t -> struct target_type

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

diff --git a/src/target/target.h b/src/target/target.h
index ef3f6ccd748da1e46a5b34f821684d2861a70e3e..50e8c624eb4492b545fb119b01b059720a637cfe 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -33,7 +33,7 @@
 #include "command.h"
 
 struct reg_s;
-struct trace_s;
+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 */
@@ -154,7 +151,7 @@ typedef struct target_s
        struct reg_cache *reg_cache;            /* the first register cache of the target (core regs) */
        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 */