From 7665082ad05ca15d42b2bea4c18d8bae9ee37280 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Thu, 24 May 2018 10:17:00 +0800 Subject: [PATCH] feat(esp8266): Make os_printf equal to printf Since the string used by printf are put in flash by default. Don't need the old os_printf to define a macro to put string to flash manually. --- components/esp8266/include/esp_libc.h | 6 +----- .../ssl/mbedtls/port/openssl/include/platform/ssl_port.h | 9 +-------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/components/esp8266/include/esp_libc.h b/components/esp8266/include/esp_libc.h index bd979c90..ab4d0d04 100644 --- a/components/esp8266/include/esp_libc.h +++ b/components/esp8266/include/esp_libc.h @@ -73,11 +73,7 @@ unsigned long os_random(void); int os_get_random(unsigned char *buf, size_t len); #ifndef os_printf -/* NOTE: don't use printf_opt in irq handler, for test */ -#define os_printf(fmt, ...) do { \ - static const char flash_str[] ICACHE_RODATA_ATTR STORE_ATTR = fmt; \ - printf(flash_str, ##__VA_ARGS__); \ - } while(0) +#define os_printf printf #endif /* Note: check_memleak_debug_enable is a weak function inside SDK. diff --git a/components/ssl/mbedtls/port/openssl/include/platform/ssl_port.h b/components/ssl/mbedtls/port/openssl/include/platform/ssl_port.h index 4403c420..77ac7478 100644 --- a/components/ssl/mbedtls/port/openssl/include/platform/ssl_port.h +++ b/components/ssl/mbedtls/port/openssl/include/platform/ssl_port.h @@ -63,14 +63,7 @@ extern void vPortFree(void *pv); #define ssl_speed_up_enter() system_update_cpu_freq(SYS_CPU_160MHZ) #define ssl_speed_up_exit() system_update_cpu_freq(SYS_CPU_80MHZ) -#ifndef os_printf -#define os_printf(fmt, ...) do { \ - static const char flash_str[] ICACHE_RODATA_ATTR STORE_ATTR = fmt; \ - printf(flash_str, ##__VA_ARGS__); \ - } while(0) -#endif - -#define SSL_DEBUG_LOG os_printf +#define SSL_DEBUG_LOG printf #define LOCAL_ATRR ICACHE_RODATA_ATTR STORE_ATTR