From 6e35b1eba30055d92b48bec13b35c4a7a41cc31e Mon Sep 17 00:00:00 2001 From: Guillaume Souchere Date: Fri, 10 Feb 2023 07:41:30 +0100 Subject: [PATCH] heap: Fix priority in shex() bit shift --- components/heap/heap_caps.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/heap/heap_caps.c b/components/heap/heap_caps.c index cb82842f4f..7911702a45 100644 --- a/components/heap/heap_caps.c +++ b/components/heap/heap_caps.c @@ -34,22 +34,22 @@ static esp_alloc_failed_hook_t alloc_failed_callback; #ifdef CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS -IRAM_ATTR static void shex(char buf[8], uint32_t n) +IRAM_ATTR static void hex_to_str(char buf[8], uint32_t n) { for (int i = 0; i < 8; i++) { - uint8_t b4 = (n >> 28 - (i * 4)) & 0b1111; - buf[i] = b4 <= 9 ? '0' + b4 : 'a' + b4 - 10; + uint8_t b4 = (n >> (28 - i * 4)) & 0b1111; + buf[i] = b4 <= 9 ? '0' + b4 : 'a' + b4 - 10; } } IRAM_ATTR static void fmt_abort_str(char dest[48], size_t size, uint32_t caps) { char sSize[8]; char sCaps[8]; - shex(sSize,size); - shex(sCaps,caps); + hex_to_str(sSize, size); + hex_to_str(sCaps, caps); memcpy(dest, "Mem alloc fail. size 0x00000000 caps 0x00000000", 48); - memcpy(dest+23, sSize, 8); - memcpy(dest+39, sCaps, 8); + memcpy(dest + 23, sSize, 8); + memcpy(dest + 39, sCaps, 8); } #endif