reg_t -> struct reg

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

diff --git a/src/target/target.h b/src/target/target.h
index 0c52c11ee0ee2f572f89d5ce15d0ee1f4bec8f54..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,21 +124,15 @@ 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;
-
-/* forward decloration */
-typedef struct target_event_action_s target_event_action_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 */
        const char *variant;                            /* what varient of this chip is it? */
-       target_event_action_t *event_action;
+       struct target_event_action *event_action;
 
        int reset_halt;                                         /* attempt resetting the CPU into the halted mode? */
        uint32_t working_area;                                  /* working area (initialized RAM). Evaluated
@@ -155,10 +149,10 @@ 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 debug_msg_receiver_s *dbgmsg;/* list of debug message receivers */
+       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 */
        struct target_s *next;                          /* next target in list */
@@ -225,11 +219,11 @@ enum target_event
        TARGET_EVENT_GDB_FLASH_WRITE_END,
 };
 
-struct target_event_action_s {
+struct target_event_action {
        enum target_event event;
        Jim_Obj *body;
        int has_percent;
-       target_event_action_t *next;
+       struct target_event_action *next;
  };
 
 struct target_event_callback
@@ -239,15 +233,15 @@ struct target_event_callback
        struct target_event_callback *next;
 };
 
-typedef struct target_timer_callback_s
+struct target_timer_callback
 {
        int (*callback)(void *priv);
        int time_ms;
        int periodic;
        struct timeval when;
        void *priv;
-       struct target_timer_callback_s *next;
-} target_timer_callback_t;
+       struct target_timer_callback *next;
+};
 
 int target_register_commands(struct command_context_s *cmd_ctx);
 int target_register_user_commands(struct command_context_s *cmd_ctx);
@@ -316,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.
  *
@@ -345,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.
@@ -451,7 +445,7 @@ void target_free_all_working_areas_restore(struct target_s *target, int restore)
 extern target_t *all_targets;
 
 extern struct target_event_callback *target_event_callbacks;
-extern target_timer_callback_t *target_timer_callbacks;
+extern struct target_timer_callback *target_timer_callbacks;
 
 uint32_t target_buffer_get_u32(target_t *target, const uint8_t *buffer);
 uint16_t target_buffer_get_u16(target_t *target, const uint8_t *buffer);