From 4909fdfe0220d74aefcdd385547ae0b21ab8bb69 Mon Sep 17 00:00:00 2001 From: Felipe Neves Date: Mon, 9 Dec 2019 12:05:19 -0300 Subject: [PATCH] heap_caps: small fixes on comments plus cleaning --- components/expat/expat | 2 +- components/heap/heap_caps.c | 8 +++----- components/lwip/lwip | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/components/expat/expat b/components/expat/expat index a7bc26b69..968b8cc46 160000 --- a/components/expat/expat +++ b/components/expat/expat @@ -1 +1 @@ -Subproject commit a7bc26b69768f7fb24f0c7976fae24b157b85b13 +Subproject commit 968b8cc46dbee47b83318d5f31a8e7907199614b diff --git a/components/heap/heap_caps.c b/components/heap/heap_caps.c index 2661bcb61..66d348ccd 100644 --- a/components/heap/heap_caps.c +++ b/components/heap/heap_caps.c @@ -293,18 +293,16 @@ IRAM_ATTR void *heap_caps_realloc( void *ptr, size_t size, int caps) } //The pointer to memory may be aliased, we need to - //recover it before to manage a new allocation: + //recover the corresponding address before to manage a new allocation: if(esp_ptr_in_diram_iram((void *)ptr)) { uint32_t *dram_addr = (uint32_t *)ptr; dram_ptr = (void *)dram_addr[-1]; - //printf("[HEAP_CAPS_MALLOC]: obtained pointer that was aliased: %p \n", (void *)ptr); - heap = find_containing_heap(dram_ptr); assert(heap != NULL && "realloc() pointer is outside heap areas"); - //with pointers that reside on diram space, we avoid to - //to use realloc implementation due to address translation issues, + //with pointers that reside on diram space, we avoid using + //the realloc implementation due to address translation issues, //instead force a malloc/copy/free ptr_in_diram_case = true; diff --git a/components/lwip/lwip b/components/lwip/lwip index c9e3b53c6..31e24ae95 160000 --- a/components/lwip/lwip +++ b/components/lwip/lwip @@ -1 +1 @@ -Subproject commit c9e3b53c6f04052943f97210b858cec805cc98d9 +Subproject commit 31e24ae95a59e51d74f435f48fa21091b26c1430