target: avoid using interp global variable

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

diff --git a/src/target/target.h b/src/target/target.h
index ee40209cb99bc01fd87a89c5574a2695d7b68036..af4727ce4046a056dc4d43cd6c5a12326401ffd8 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -159,6 +159,12 @@ struct target
        long long halt_issued_time;                     /* Note time when halt was issued */
 };
 
+/** Returns the instance-specific name of the specified target. */
+static inline const char *target_name(struct target *target)
+{
+       return target->cmd_name;
+}
+
 enum target_event
 {
        /* LD historical names
@@ -166,8 +172,6 @@ enum target_event
         * - June/July/Aug 2008
         * - Duane Ellis */
        TARGET_EVENT_OLD_gdb_program_config,
-       TARGET_EVENT_OLD_pre_reset,
-       TARGET_EVENT_OLD_post_reset,
        TARGET_EVENT_OLD_pre_resume,
 
        /* allow GDB to do stuff before others handle the halted event,
@@ -190,6 +194,7 @@ enum target_event
 
        TARGET_EVENT_RESET_START,
        TARGET_EVENT_RESET_ASSERT_PRE,
+       TARGET_EVENT_RESET_ASSERT,      /* C code uses this instead of SRST */
        TARGET_EVENT_RESET_ASSERT_POST,
        TARGET_EVENT_RESET_DEASSERT_PRE,
        TARGET_EVENT_RESET_DEASSERT_POST,
@@ -217,10 +222,13 @@ enum target_event
 
 struct target_event_action {
        enum target_event event;
+       Jim_Interp *interp;
        struct Jim_Obj *body;
        int has_percent;
        struct target_event_action *next;
- };
+};
+
+bool target_has_event_action(struct target *target, enum target_event event);
 
 struct target_event_callback
 {
@@ -280,11 +288,12 @@ struct target* get_current_target(struct command_context *cmd_ctx);
 struct target *get_target(const char *id);
 
 /**
- * Get the target name.
+ * Get the target type name.
  *
  * This routine is a wrapper for the target->type->name field.
+ * Note that this is not an instance-specific name for his target.
  */
-const char *target_get_name(struct target *target);
+const char *target_type_name(struct target *target);
 
 /**
  * Examine the specified @a target, letting it perform any