X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftrace.h;h=bb9c33637c8cfaa8854571b3dcf80528c266f913;hp=f7d9e5b1a7667d040ae93289eec36813f0bf7a27;hb=1338cf60b91c582fa4b27d5226ab4374117be415;hpb=e27696f6b04459e935a0a5f65f7f668cb02970dd

diff --git a/src/target/trace.h b/src/target/trace.h
index f7d9e5b1a7..bb9c33637c 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -15,34 +15,36 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef TRACE_H
 #define TRACE_H
 
-#include "target.h"
-#include "command.h"
-#include "types.h"
-
-typedef struct trace_point_s
-{
-	u32 address;
-	u64 hit_counter;
-} trace_point_t;
-
-typedef struct trace_s
-{
-	int num_trace_points;
-	int trace_points_size;
-	trace_point_t *trace_points;
-	int trace_history_size;
-	u32 *trace_history;
-	int trace_history_pos;
+struct target;
+struct command_context;
+
+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;
-} trace_t;
+};
 
-typedef enum trace_status
-{
+/**
+ * \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,
@@ -50,10 +52,10 @@ typedef enum trace_status
 	TRACE_OVERFLOWED = 0x8,
 } trace_status_t;
 
-extern int trace_point(struct target_s *target, int 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 */