ARM: cygwin complile fixes

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

diff --git a/src/target/etm.h b/src/target/etm.h
index b74c6d9049451665ad472123276de921a46a48d3..5aea65714134648d860e0f15daac1d012dfa90ae 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -23,8 +23,8 @@
 #ifndef ETM_H
 #define ETM_H
 
-#include "trace.h"
-#include "arm_jtag.h"
+#include <target/trace.h>
+#include <target/arm_jtag.h>
 
 struct image;
 
@@ -126,7 +126,7 @@ struct etm_context;
 struct etm_capture_driver
 {
        char *name;
-       int (*register_commands)(struct command_context *cmd_ctx);
+       const struct command_registration *commands;
        int (*init)(struct etm_context *etm_ctx);
        trace_status_t (*status)(struct etm_context *etm_ctx);
        int (*read_trace)(struct etm_context *etm_ctx);
@@ -164,7 +164,7 @@ struct etm_context
        uint32_t trace_depth;           /* number of cycles to be analyzed, 0 if no data available */
        etm_portmode_t portmode;        /* normal, multiplexed or demultiplexed */
        etmv1_tracemode_t tracemode;    /* type of info trace contains */
-       int /*armv4_5_state_t*/ core_state;     /* current core state */
+       int /*arm_state*/ core_state;   /* current core state */
        struct image *image;            /* source for target opcodes */
        uint32_t pipe_index;            /* current trace cycle */
        uint32_t data_index;            /* cycle holding next data packet */
@@ -212,7 +212,7 @@ struct reg_cache* etm_build_reg_cache(struct target *target,
 
 int etm_setup(struct target *target);
 
-int etm_register_commands(struct command_context *cmd_ctx);
+extern const struct command_registration etm_command_handlers[];
 
 #define ERROR_ETM_INVALID_DRIVER       (-1300)
 #define ERROR_ETM_PORTMODE_NOT_SUPPORTED       (-1301)