Merge branch 'bugfix/coredump_improvements_refactoring_delete_include…

…' into 'master' esp32: coredump refactoring fix bug (remove duplicated include) See merge request idf/esp-idf!4328
espressif · Mar 11, 2019 · fc4823c · fc4823c
2 parents 79ca95d + 13e1c0b
commit fc4823c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 89 deletions.
diff --git a/components/esp32/CMakeLists.txt b/components/esp32/CMakeLists.txt
@@ -59,7 +59,7 @@ else()
     # app_update is added here because cpu_start.c uses esp_ota_get_app_description() function.
     set(COMPONENT_PRIV_REQUIRES
         app_trace app_update bootloader_support ethernet log mbedtls nvs_flash
-        pthread smartconfig_ack spi_flash vfs wpa_supplicant xtensa-debug-module)
+        pthread smartconfig_ack spi_flash vfs wpa_supplicant xtensa-debug-module espcoredump)
 
     set(COMPONENT_ADD_LDFRAGMENTS linker.lf ld/esp32_fragments.lf)
 

diff --git a/components/esp32/include/esp_core_dump.h b/components/esp32/include/esp_core_dump.h
diff --git a/components/espcoredump/include/esp_core_dump.h b/components/espcoredump/include/esp_core_dump.h
@@ -14,6 +14,10 @@
 #ifndef ESP_CORE_DUMP_H_
 #define ESP_CORE_DUMP_H_
 
+#include <stddef.h>
+#include "esp_err.h"
+#include "freertos/xtensa_context.h"
+
 /**************************************************************************************/
 /******************************** EXCEPTION MODE API **********************************/
 /**************************************************************************************/
@@ -54,7 +58,7 @@ void esp_core_dump_init();
  * 4) Task's stack is placed after TCB data. Size is (STACK_END - STACK_TOP) bytes.
  * 5) CRC is placed at the end of the data.
  */
-void esp_core_dump_to_flash();
+void esp_core_dump_to_flash(XtExcFrame *frame);
 
 /**
  * @brief  Print base64-encoded core dump to UART.
@@ -64,7 +68,7 @@ void esp_core_dump_to_flash();
  * 2) Since CRC is omitted TOTAL_LEN does not include its size.
  * 3) Printed base64 data are surrounded with special messages to help user recognize the start and end of actual data.
  */
-void esp_core_dump_to_uart();
+void esp_core_dump_to_uart(XtExcFrame *frame);
 
 
 /**************************************************************************************/

diff --git a/components/espcoredump/linker.lf b/components/espcoredump/linker.lf
@@ -3,4 +3,5 @@ archive: libespcoredump.a
 entries: 
     core_dump_uart (noflash_text)
     core_dump_flash (noflash_text)
-    core_dump_common (noflash_text)
+    core_dump_common (noflash_text)
+    core_dump_port (noflash_text)