Merge remote-tracking branch 'remotes/esp8266/master'

cores/esp8266/heap.c

@@ -32,7 +32,7 @@ void* ICACHE_RAM_ATTR pvPortZalloc(size_t size, const char* file, int line)
     return calloc(1, size);
 }
 
-size_t ICACHE_RAM_ATTR xPortGetFreeHeapSize(void)
+size_t xPortGetFreeHeapSize(void)
 {
     return umm_free_heap_size();
 }

cores/esp8266/umm_malloc/umm_malloc.c

@@ -967,7 +967,7 @@ static void *get_unpoisoned( unsigned char *ptr ) {
 
 UMM_HEAP_INFO ummHeapInfo;
 
-void *umm_info( void *ptr, int force ) {
+void ICACHE_FLASH_ATTR *umm_info( void *ptr, int force ) {
 
   unsigned short int blockNo = 0;
 
@@ -1728,7 +1728,7 @@ void umm_free( void *ptr ) {
 
 /* ------------------------------------------------------------------------ */
 
-size_t umm_free_heap_size( void ) {
+size_t ICACHE_FLASH_ATTR umm_free_heap_size( void ) {
   umm_info(NULL, 0);
   return (size_t)ummHeapInfo.freeBlocks * sizeof(umm_block);
 }

cores/esp8266/umm_malloc/umm_malloc_cfg.h

@@ -6,6 +6,13 @@
 #define _UMM_MALLOC_CFG_H
 
 #include <debug.h>
+#ifdef __cplusplus
+#extern "C" {
+#endif
+#include "c_types.h"
+#ifdef __cplusplus
+}
+#endif
 /*
  * There are a number of defines you can set at compile time that affect how
  * the memory allocator will operate.