From edcf2accf73d13f642d3edaa52c0565aa5d411e8 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Thu, 20 May 2021 10:42:21 -0400
Subject: [PATCH] tracing: rearrange tool header inclusion

tracerecorder maintains its macros definitions outside of zephyr and can
deal with undefined macros or hooks that are implemented in Zephyr but
not yet implemented in TR. Move inclusion to the bottom after all macros
have been initialized.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 include/tracing/tracing.h | 45 +++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/include/tracing/tracing.h b/include/tracing/tracing.h
index fa73aad8155..b5bbff5cbef 100644
--- a/include/tracing/tracing.h
+++ b/include/tracing/tracing.h
@@ -8,21 +8,7 @@
 
 #include <kernel.h>
 
-#if defined CONFIG_PERCEPIO_TRACERECORDER
-#include "tracing_tracerecorder.h"
-
-/* Wait for those to be implemented by Tracealyzer */
-#define sys_port_trace_pm_system_suspend_enter(ticks)
-#define sys_port_trace_pm_system_suspend_exit(ticks, ret)
-#define sys_port_trace_pm_device_request_enter(dev, target_state)
-#define sys_port_trace_pm_device_request_exit(dev, ret)
-
-#define sys_port_trace_pm_device_enable_enter(dev)
-#define sys_port_trace_pm_device_enable_exit(dev)
-#define sys_port_trace_pm_device_disable_enter(dev)
-#define sys_port_trace_pm_device_disable_exit(dev)
-
-#elif defined CONFIG_SEGGER_SYSTEMVIEW
+#if defined CONFIG_SEGGER_SYSTEMVIEW
 #include "tracing_sysview.h"
 
 #elif defined CONFIG_TRACING_CTF
@@ -63,13 +49,6 @@
  */
 
 
-/**
- * @brief Tracing APIs
- * @defgroup tracing_apis Tracing APIs
- * @{
- */
-
-
 /**
  * @brief Thread Tracing APIs
  * @defgroup thread_tracing_apis Thread Tracing APIs
@@ -1938,10 +1917,26 @@
  * @}
  */ /* end of timer_tracing_apis */
 
+#define sys_port_trace_pm_system_suspend_enter(ticks)
 
-/**
- * @}
- */
+#define sys_port_trace_pm_system_suspend_exit(ticks, ret)
+
+#define sys_port_trace_pm_device_request_enter(dev, target_state)
+
+#define sys_port_trace_pm_device_request_exit(dev, ret)
+
+#define sys_port_trace_pm_device_enable_enter(dev)
+
+#define sys_port_trace_pm_device_enable_exit(dev)
+
+#define sys_port_trace_pm_device_disable_enter(dev)
+
+#define sys_port_trace_pm_device_disable_exit(dev)
+
+
+#if defined CONFIG_PERCEPIO_TRACERECORDER
+#include "tracing_tracerecorder.h"
+#endif
 
 #endif
 #endif