From b82e0d49a8b876929b4770f1249d1633d5288098 Mon Sep 17 00:00:00 2001 From: suda-morris <362953310@qq.com> Date: Wed, 3 Apr 2019 14:28:57 +0800 Subject: [PATCH] make app_trace support esp32c --- components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h | 4 +++- .../sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h b/components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h index 2968c6e021..25a05a8bc1 100644 --- a/components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h +++ b/components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h @@ -65,6 +65,8 @@ Revision: $Rev: 5927 $ #ifndef SEGGER_SYSVIEW_CONF_H #define SEGGER_SYSVIEW_CONF_H +#include "soc/soc.h" + /********************************************************************* * * Defines, fixed @@ -147,7 +149,7 @@ Revision: $Rev: 5927 $ * SystemView Id configuration */ //TODO: optimise it -#define SEGGER_SYSVIEW_ID_BASE 0x3F400000 // Default value for the lowest Id reported by the application. Can be overridden by the application via SEGGER_SYSVIEW_SetRAMBase(). (i.e. 0x20000000 when all Ids are an address in this RAM) +#define SEGGER_SYSVIEW_ID_BASE SOC_DROM_LOW // Default value for the lowest Id reported by the application. Can be overridden by the application via SEGGER_SYSVIEW_SetRAMBase(). (i.e. 0x20000000 when all Ids are an address in this RAM) #define SEGGER_SYSVIEW_ID_SHIFT 0 // Number of bits to shift the Id to save bandwidth. (i.e. 2 when Ids are 4 byte aligned) /********************************************************************* diff --git a/components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c b/components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c index 90db930d55..2530fee8f9 100644 --- a/components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c +++ b/components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c @@ -68,6 +68,7 @@ Revision: $Rev: 3734 $ #include "esp_app_trace_util.h" #include "esp_intr_alloc.h" #include "esp32/clk.h" +#include "soc/soc.h" extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI; @@ -130,7 +131,7 @@ extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI; #define SYSVIEW_CPU_FREQ (esp_clk_cpu_freq()) // The lowest RAM address used for IDs (pointers) -#define SYSVIEW_RAM_BASE (0x3F400000) +#define SYSVIEW_RAM_BASE (SOC_DROM_LOW) #if CONFIG_FREERTOS_CORETIMER_0 #define SYSTICK_INTR_ID (ETS_INTERNAL_TIMER0_INTR_SOURCE+ETS_INTERNAL_INTR_SOURCE_OFF)