MinGW build fixes

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

diff --git a/src/target/target.h b/src/target/target.h
index 55e9088ac638b116c56d00b59a29e64b39d535b4..4151c228b6b0479b9cdb1ea0c835803bac38bbd1 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -26,8 +26,7 @@
 #ifndef TARGET_H
 #define TARGET_H
 
-#include "types.h"
-#include "jim.h"
+#include <helper/types.h>
 
 struct reg;
 struct trace;
@@ -61,15 +60,11 @@ enum target_state
        TARGET_DEBUG_RUNNING = 4,
 };
 
-extern const Jim_Nvp nvp_target_state[];
-
 enum nvp_assert {
        NVP_DEASSERT,
        NVP_ASSERT,
 };
 
-extern const Jim_Nvp nvp_assert[];
-
 enum target_reset_mode
 {
        RESET_UNKNOWN = 0,
@@ -78,8 +73,6 @@ enum target_reset_mode
        RESET_INIT = 3,         /* reset and halt target out of reset, then run init script */
 };
 
-extern const Jim_Nvp nvp_reset_mode[];
-
 enum target_debug_reason
 {
        DBG_REASON_DBGRQ = 0,
@@ -91,16 +84,12 @@ enum target_debug_reason
        DBG_REASON_UNDEFINED = 6
 };
 
-extern const Jim_Nvp nvp_target_debug_reason[];
-
 enum target_endianess
 {
        TARGET_ENDIAN_UNKNOWN = 0,
        TARGET_BIG_ENDIAN = 1, TARGET_LITTLE_ENDIAN = 2
 };
 
-extern const Jim_Nvp nvp_target_endian[];
-
 struct working_area
 {
        uint32_t address;
@@ -165,6 +154,8 @@ static inline const char *target_name(struct target *target)
        return target->cmd_name;
 }
 
+const char *debug_reason_name(struct target *t);
+
 enum target_event
 {
        /* LD historical names
@@ -172,8 +163,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,
@@ -224,6 +213,7 @@ enum target_event
 
 struct target_event_action {
        enum target_event event;
+       struct Jim_Interp *interp;
        struct Jim_Obj *body;
        int has_percent;
        struct target_event_action *next;
@@ -252,7 +242,6 @@ int target_register_commands(struct command_context *cmd_ctx);
 int target_register_user_commands(struct command_context *cmd_ctx);
 int target_init(struct command_context *cmd_ctx);
 int target_examine(void);
-int handle_target(void *priv);
 int target_process_reset(struct command_context *cmd_ctx,
                enum target_reset_mode reset_mode);
 
@@ -492,8 +481,6 @@ void target_all_handle_event(enum target_event e);
 #define ERROR_TARGET_NOT_RUNNING (-310)
 #define ERROR_TARGET_NOT_EXAMINED (-311)
 
-extern const Jim_Nvp nvp_error_target[];
-
 const char *target_strerror_safe(int err);
 
 #endif /* TARGET_H */