fixe types, fix names

Author: d-a-v

cores/esp8266/Esp-frag.cpp

@@ -23,7 +23,7 @@
 #include "coredecls.h"
 #include "Esp.h"
 
-void EspClass::getHeapStats(uint32_t* free, uint16_t* max, uint8_t* frag)
+void EspClass::getHeapStats(uint32_t* hfree, uint16_t* hmax, uint8_t* hfrag)
 {
     // L2 / Euclidian norm of free block sizes.
     // Having getFreeHeap()=sum(hole-size), fragmentation is given by
@@ -32,17 +32,17 @@ void EspClass::getHeapStats(uint32_t* free, uint16_t* max, uint8_t* frag)
     umm_info(NULL, 0);
     uint8_t block_size = umm_block_size();
     uint32_t fh = ummHeapInfo.freeBlocks * block_size;
-    if (free)
-        *free = fh;
-    if (max)
-        *max = ummHeapInfo.maxFreeContiguousBlocks * block_size;
-    if (frag)
-        *frag = 100 - (sqrt32(ummHeapInfo.ummFreeSize2) * 100) / fh;
+    if (hfree)
+        *hfree = fh;
+    if (hmax)
+        *hmax = ummHeapInfo.maxFreeContiguousBlocks * block_size;
+    if (hfrag)
+        *hfrag = 100 - (sqrt32(ummHeapInfo.freeSize2) * 100) / fh;
 }
 
 uint8_t EspClass::getHeapFragmentation()
 {
-    uint8_t frag;
-    getHeapStats(nullptr, nullptr, &frag);
-    return frag;
+    uint8_t hfrag;
+    getHeapStats(nullptr, nullptr, &hfrag);
+    return hfrag;
 }

cores/esp8266/umm_malloc/umm_malloc.c

@@ -1024,7 +1024,10 @@ void ICACHE_FLASH_ATTR *umm_info( void *ptr, int force ) {
     if( UMM_NBLOCK(blockNo) & UMM_FREELIST_MASK ) {
       ++ummHeapInfo.freeEntries;
       ummHeapInfo.freeBlocks += curBlocks;
-      ummHeapInfo.ummFreeSize2 += (uint32_t)curBlocks * (uint32_t)sizeof(umm_block) * (uint32_t)curBlocks * (uint32_t)sizeof(umm_block);
+      ummHeapInfo.freeSize2 += (unsigned int)curBlocks
+                             * (unsigned int)sizeof(umm_block)
+                             * (unsigned int)curBlocks
+                             * (unsigned int)sizeof(umm_block);
 
       if (ummHeapInfo.maxFreeContiguousBlocks < curBlocks) {
         ummHeapInfo.maxFreeContiguousBlocks = curBlocks;
@@ -1762,7 +1765,7 @@ size_t ICACHE_FLASH_ATTR umm_free_heap_size( void ) {
   return (size_t)ummHeapInfo.freeBlocks * sizeof(umm_block);
 }
 
-uint16_t ICACHE_FLASH_ATTR umm_max_block_size( void ) {
+size_t ICACHE_FLASH_ATTR umm_max_block_size( void ) {
   umm_info(NULL, 0);
   return ummHeapInfo.maxFreeContiguousBlocks * sizeof(umm_block);
 }

cores/esp8266/umm_malloc/umm_malloc.h

@@ -27,7 +27,7 @@ typedef struct UMM_HEAP_INFO_t {
 
   unsigned short int maxFreeContiguousBlocks;
 
-  uint32_t ummFreeSize2;
+  unsigned int freeSize2;
 }
 UMM_HEAP_INFO;
 
@@ -43,8 +43,8 @@ void *umm_realloc( void *ptr, size_t size );
 void umm_free( void *ptr );
 
 size_t umm_free_heap_size( void );
-uint16_t umm_max_block_size( void );
-size_t umm_block_size ( void );
+size_t umm_max_block_size( void );
+size_t umm_block_size( void );
 
 #ifdef __cplusplus
 }