Commit e9908834 authored by Deomid Ryabkov's avatar Deomid Ryabkov Committed by Cesanta Bot

Use ICACHE_FLASH to guess CS_P_ESP8266

Also, do not require -DRTOS_SDK and pick socket/low-level event manager
based on LWIP_SOCKET.

PUBLISHED_FROM=d4afbdf8dab62a1c6ac4ca075c4a58887223dba4
parent 6a12bd7a
...@@ -23,9 +23,7 @@ endif ...@@ -23,9 +23,7 @@ endif
# makefile at its root level - these are then overridden # makefile at its root level - these are then overridden
# for a subtree within the makefile rooted therein # for a subtree within the makefile rooted therein
# #
DEFINES += -DCS_PLATFORM=3 \ DEFINES +=
-DRTOS_SDK \
-DMG_INTERNAL=
############################################################# #############################################################
# Recursion Magic - Don't touch this!! # Recursion Magic - Don't touch this!!
......
...@@ -77,6 +77,8 @@ ...@@ -77,6 +77,8 @@
#define CS_PLATFORM CS_P_NXP_KINETIS #define CS_PLATFORM CS_P_NXP_KINETIS
#elif defined(PIC32) #elif defined(PIC32)
#define CS_PLATFORM CS_P_PIC32_HARMONY #define CS_PLATFORM CS_P_PIC32_HARMONY
#elif defined(ICACHE_FLASH)
#define CS_PLATFORM CS_P_ESP8266
#endif #endif
#ifndef CS_PLATFORM #ifndef CS_PLATFORM
...@@ -465,14 +467,17 @@ typedef struct stat cs_stat_t; ...@@ -465,14 +467,17 @@ typedef struct stat cs_stat_t;
#define MG_LWIP 1 #define MG_LWIP 1
#ifdef RTOS_SDK /* struct timeval is defined in sys/time.h. */
#define LWIP_TIMEVAL_PRIVATE 0
#ifndef MG_NET_IF
#include <lwip/opt.h>
#if LWIP_SOCKET /* RTOS SDK has LWIP sockets */
# define MG_NET_IF MG_NET_IF_SOCKET # define MG_NET_IF MG_NET_IF_SOCKET
#else #else
# define MG_NET_IF MG_NET_IF_LWIP_LOW_LEVEL # define MG_NET_IF MG_NET_IF_LWIP_LOW_LEVEL
#endif #endif
#endif
/* struct timeval is defined in sys/time.h. */
#define LWIP_TIMEVAL_PRIVATE 0
#ifndef CS_ENABLE_STDIO #ifndef CS_ENABLE_STDIO
#define CS_ENABLE_STDIO 1 #define CS_ENABLE_STDIO 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment