build: cleanup src/target directory

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

diff --git a/src/target/trace.h b/src/target/trace.h
index 92613161aa7203d8a41ebc5a8ddafc7a7247234f..5eaf8c8412d5326915fdf3ce898498a792e0a9e9 100644 (file)
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -17,33 +17,36 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef TRACE_H
 #define TRACE_H
 
-#include "types.h"
-
-struct target_s;
-struct command_context_s;
-
-typedef struct trace_point_s
-{
-       u32 address;
-       u64 hit_counter;
-} trace_point_t;
-
-typedef struct trace_s
-{
-       u32 num_trace_points;
-       u32 trace_points_size;
-       trace_point_t *trace_points;
-       u32 trace_history_size;
-       u32 *trace_history;
-       u32 trace_history_pos;
-       int trace_history_overflowed;
-} trace_t;
+#include <helper/types.h>
+
+struct target;
+struct command_context;
 
-typedef enum trace_status
-{
+struct trace_point {
+       uint32_t address;
+       uint64_t hit_counter;
+};
+
+struct trace {
+       uint32_t num_trace_points;
+       uint32_t trace_points_size;
+       struct trace_point *trace_points;
+       uint32_t trace_history_size;
+       uint32_t *trace_history;
+       uint32_t trace_history_pos;
+       int trace_history_overflowed;
+};
+
+/**
+ * \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,
        TRACE_RUNNING = 0x1,
        TRACE_TRIGGERED = 0x2,
@@ -51,10 +54,10 @@ typedef enum trace_status
        TRACE_OVERFLOWED = 0x8,
 } trace_status_t;
 
-extern int trace_point(struct target_s *target, u32 number);
-extern 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 */