target_event_action_t -> struct target_event_action

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

diff --git a/src/target/target.h b/src/target/target.h
index 14973550cbbf253c17a51549f23328f5b53dc81a..e872ec6656ecfc30685ea994b73b29d84089e163 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -128,9 +128,6 @@ struct working_area
 struct target_type_s;
 typedef struct target_type_s target_type_t;
 
-/* forward decloration */
-typedef struct target_event_action_s target_event_action_t;
-
 typedef struct target_s
 {
        target_type_t *type;                            /* target type definition (name, access functions) */
@@ -138,7 +135,7 @@ typedef struct target_s
        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
@@ -158,7 +155,7 @@ typedef struct target_s
        struct breakpoint_s *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 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,29 +222,29 @@ 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;
  };
 
-typedef struct target_event_callback_s
+struct target_event_callback
 {
        int (*callback)(struct target_s *target, enum target_event event, void *priv);
        void *priv;
-       struct target_event_callback_s *next;
-} target_event_callback_t;
+       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);
@@ -450,8 +447,8 @@ void target_free_all_working_areas_restore(struct target_s *target, int restore)
 
 extern target_t *all_targets;
 
-extern target_event_callback_t *target_event_callbacks;
-extern target_timer_callback_t *target_timer_callbacks;
+extern struct target_event_callback *target_event_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);