MR suggestions

diff --git a/components/esp32/heap_alloc_caps.c b/components/esp32/heap_alloc_caps.c
index 565dd9b8fd9dcb25f3b8773c1c6f79ea8f581535..6597ca7f0790c38634a75a7847c49179e789307e 100644 (file)
--- a/components/esp32/heap_alloc_caps.c
+++ b/components/esp32/heap_alloc_caps.c
@@ -215,27 +215,27 @@ void heap_alloc_caps_init() {
        is a somewhat risky action in theory, because on initializing the allocator, it will go and write linked
        list entries at the start and end of all regions. For the ESP32, these linked list entries happen to end
        up in a region that is not touched by the stack; they can be placed safely there.*/
-    disable_mem_region((void*)0x3ffe0000, (void*)0x3ffe0440); //knock out ROM PRO data region
-    disable_mem_region((void*)0x3ffe4000, (void*)0x3ffe4350); //knock out ROM APP data region
+    disable_mem_region((void*)0x3ffe0000, (void*)0x3ffe0440); //Reserve ROM PRO data region
+    disable_mem_region((void*)0x3ffe4000, (void*)0x3ffe4350); //Reserve ROM APP data region
 
 #if CONFIG_BT_ENABLED
 #if CONFIG_BT_DRAM_RELEASE
-    disable_mem_region((void*)0x3ffb0000, (void*)0x3ffb3000); //knock out BT data region
-    disable_mem_region((void*)0x3ffb8000, (void*)0x3ffbbb28); //knock out BT data region
-    disable_mem_region((void*)0x3ffbdb28, (void*)0x3ffc0000); //knock out BT data region
+    disable_mem_region((void*)0x3ffb0000, (void*)0x3ffb3000); //Reserve BT data region
+    disable_mem_region((void*)0x3ffb8000, (void*)0x3ffbbb28); //Reserve BT data region
+    disable_mem_region((void*)0x3ffbdb28, (void*)0x3ffc0000); //Reserve BT data region
 #else
-    disable_mem_region((void*)0x3ffb0000, (void*)0x3ffc0000); //knock out BT hardware shared memory & BT data region
+    disable_mem_region((void*)0x3ffb0000, (void*)0x3ffc0000); //Reserve BT hardware shared memory & BT data region
 #endif
-    disable_mem_region((void*)0x3ffae000, (void*)0x3ffaff10); //knock out ROM data region, inc region needed for BT ROM routines
+    disable_mem_region((void*)0x3ffae000, (void*)0x3ffaff10); //Reserve ROM data region, inc region needed for BT ROM routines
 #else
-    disable_mem_region((void*)0x3ffae000, (void*)0x3ffae2a0); //knock out ROM data region
+    disable_mem_region((void*)0x3ffae000, (void*)0x3ffae2a0); //Reserve ROM data region
 #endif
 
 #if CONFIG_MEMMAP_TRACEMEM
 #if CONFIG_MEMMAP_TRACEMEM_TWOBANKS
-    disable_mem_region((void*)0x3fff8000, (void*)0x40000000); //knock out trace mem region
+    disable_mem_region((void*)0x3fff8000, (void*)0x40000000); //Reserve trace mem region
 #else
-    disable_mem_region((void*)0x3fff8000, (void*)0x3fffc000); //knock out trace mem region
+    disable_mem_region((void*)0x3fff8000, (void*)0x3fffc000); //Reserve trace mem region
 #endif
 #endif
 

diff --git a/components/esp32/include/heap_alloc_caps.h b/components/esp32/include/heap_alloc_caps.h
new file mode 100644 (file)
index 0000000..edab15d
--- /dev/null
+++ b/components/esp32/include/heap_alloc_caps.h
@@ -0,0 +1,3 @@
+#pragma once
+#warning heap_alloc_caps.h has been renamed to esp_heap_alloc_caps.h. The old header file is deprecated and will be removed in v3.0.
+#include "esp_heap_alloc_caps.h"

diff --git a/components/esp32/ld/esp32.rom.ld b/components/esp32/ld/esp32.rom.ld
index bed42c988acd74f679f86ece0044ed0126f742ae..6cbd2fc7474b3505e2403d56b2b0ef2d71d305f6 100644 (file)
--- a/components/esp32/ld/esp32.rom.ld
+++ b/components/esp32/ld/esp32.rom.ld
@@ -1675,7 +1675,7 @@ PROVIDE ( uart_tx_wait_idle = 0x40009278 );
 These functions are part of the ROM GPIO driver. We do not use them; the provided esp-idf functions
 replace them and this way we can re-use the fixed RAM addresses these routines need.
 */
-/*
+/* <-- So you don't read over it: This comment disables the next lines.
 PROVIDE ( gpio_init = 0x40009c20 );
 PROVIDE ( gpio_intr_ack = 0x40009dd4 );
 PROVIDE ( gpio_intr_ack_high = 0x40009e1c );