From 658c4d8b31c18271d64997c895d565d42f951bb5 Mon Sep 17 00:00:00 2001 From: Thorsten von Eicken Date: Sat, 19 Sep 2015 20:57:59 -0700 Subject: [PATCH] make compile with SDK 1.4.0 --- Makefile | 2 +- include/espmissingincludes.h | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 1d46090..c935555 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ XTENSA_TOOLS_ROOT ?= $(abspath ../esp-open-sdk/xtensa-lx106-elf/bin)/ # Base directory of the ESP8266 SDK package, absolute # Typically you'll download from Espressif's BBS, http://bbs.espressif.com/viewforum.php?f=5 -SDK_BASE ?= $(abspath ../esp_iot_sdk_v1.3.0) +SDK_BASE ?= $(abspath ../esp_iot_sdk_v1.4.0) # Esptool.py path and port, only used for 1-time serial flashing # Typically you'll use https://github.com/themadinventor/esptool diff --git a/include/espmissingincludes.h b/include/espmissingincludes.h index e5a20a0..70c00bf 100644 --- a/include/espmissingincludes.h +++ b/include/espmissingincludes.h @@ -40,24 +40,20 @@ int os_printf(const char *format, ...) __attribute__ ((format (printf, 1, 2))); int os_snprintf(char *str, size_t size, const char *format, ...) __attribute__ ((format (printf, 3, 4))); int os_printf_plus(const char *format, ...) __attribute__ ((format (printf, 1, 2))); +// memory allocation functions are "different" due to memory debugging functionality +// added in SDK 1.4.0 +void vPortFree(void *ptr, char * file, int line); +void *pvPortMalloc(size_t xWantedSize, char * file, int line); +void *pvPortZalloc(size_t, char * file, int line); +void *vPortMalloc(size_t xWantedSize); void pvPortFree(void *ptr); -void *pvPortMalloc(size_t xWantedSize); -void *pvPortZalloc(size_t); + void uart_div_modify(int no, unsigned int freq); -void vPortFree(void *ptr); -void *vPortMalloc(size_t xWantedSize); uint32 system_get_time(); -//uint8 wifi_get_opmode(void); // defined in SDK 1.0.0 onwards -//int os_random(); // defined in SDK 1.1.0 onwards int rand(void); void ets_bzero(void *s, size_t n); void ets_delay_us(int ms); -// Shortcuts for memory functions -#define os_malloc pvPortMalloc -#define os_free vPortFree -#define os_zalloc pvPortZalloc - // disappeared in SDK 1.1.0: #define os_timer_done ets_timer_done #define os_timer_handler_isr ets_timer_handler_isr @@ -71,4 +67,12 @@ void ets_delay_us(int ms); |( (((FUNC&BIT2)<<2)|(FUNC&0x3))<