Merge remote branch 'origin/master' into HEAD

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

diff --git a/src/target/trace.h b/src/target/trace.h
index 9fa8d606e6af3650e3ef0c02edb962058f4cfabd..53502d4d6d9f8e2be33990591625186fc657ba92 100644 (file)
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -20,10 +20,10 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-#include "types.h"
+#include <helper/types.h>
 
-struct target_s;
-struct command_context_s;
+struct target;
+struct command_context;
 
 struct trace_point
 {
@@ -31,7 +31,7 @@ struct trace_point
        uint64_t hit_counter;
 };
 
-typedef struct trace_s
+struct trace
 {
        uint32_t num_trace_points;
        uint32_t trace_points_size;
@@ -40,8 +40,13 @@ typedef struct trace_s
        uint32_t *trace_history;
        uint32_t trace_history_pos;
        int trace_history_overflowed;
-} trace_t;
+};
 
+/**
+ * \todo This enum is one of the few things in this file related
+ * to *hardware* tracing ... split such "real" tracing out from
+ * the contrib/libdcc support.
+ */
 typedef enum trace_status
 {
        TRACE_IDLE = 0x0,
@@ -51,10 +56,10 @@ typedef enum trace_status
        TRACE_OVERFLOWED = 0x8,
 } trace_status_t;
 
-int trace_point(struct target_s *target, uint32_t number);
-int trace_register_commands(struct command_context_s *cmd_ctx);
+int trace_point(struct target *target, uint32_t number);
+int trace_register_commands(struct command_context *cmd_ctx);
 
-#define ERROR_TRACE_IMAGE_UNAVAILABLE          -(1500)
-#define ERROR_TRACE_INSTRUCTION_UNAVAILABLE    -(1501)
+#define ERROR_TRACE_IMAGE_UNAVAILABLE          (-1500)
+#define ERROR_TRACE_INSTRUCTION_UNAVAILABLE    (-1501)
 
 #endif /* TRACE_H */