arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

fixes for SDK update

Browse Source 
- recompile liblwip_gcc.a with new err_t definitions
- update espconn.h (function signature change, new function)
- add option to build lwip with debug-prefix-map
This commit is contained in:
Ivan Grokhotkov 2017-10-15 14:59:37 +08:00
parent 1c8bcf6cb2
commit 84512ec811
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/sdk/lib/liblwip_gcc.a
View File

Binary file not shown.

10
tools/sdk/lwip/include/lwip/app/espconn.h
View File

@ -573,7 +573,7 @@ extern sint8 espconn_get_keepalive(struct espconn *espconn, uint8 level, void *o
* - ESPCONN_ARG: dns client not initialized or invalid hostname * - ESPCONN_ARG: dns client not initialized or invalid hostname
*******************************************************************************/ *******************************************************************************/
extern sint8 espconn_gethostbyname(struct espconn *pespconn, const char *name, ip_addr_t *addr, dns_found_callback found); extern err_t espconn_gethostbyname(struct espconn *pespconn, const char *name, ip_addr_t *addr, dns_found_callback found);
/****************************************************************************** /******************************************************************************
* FunctionName : espconn_igmp_join * FunctionName : espconn_igmp_join
@ -674,5 +674,13 @@ extern void espconn_mdns_enable(void);
* Returns : none * Returns : none
*******************************************************************************/ *******************************************************************************/
extern void espconn_dns_setserver(u8_t numdns, ip_addr_t *dnsserver); extern void espconn_dns_setserver(u8_t numdns, ip_addr_t *dnsserver);
/******************************************************************************
* FunctionName : espconn_dns_getserver
* Description : get dns server.
* Parameters : numdns -- the index of the DNS server ,must
* be < DNS_MAX_SERVERS = 2
* Returns : dnsserver -- struct ip_addr_t
*******************************************************************************/
extern ip_addr_t espconn_dns_getserver(u8_t numdns);
#endif #endif

9
tools/sdk/lwip/src/Makefile
View File

@ -1,4 +1,5 @@
TOOLS_PATH ?= ../../../xtensa-lx106-elf/bin/xtensa-lx106-elf- TOOLCHAIN_DIR ?= ../../../xtensa-lx106-elf
TOOLS_PATH ?= $(TOOLCHAIN_DIR)/bin/xtensa-lx106-elf-
LWIP_LIB ?= liblwip_src.a LWIP_LIB ?= liblwip_src.a
SDK_PATH ?= $(abspath ../../) SDK_PATH ?= $(abspath ../../)
@ -9,6 +10,10 @@ LWIP_INCLUDE = -Ibuild -I$(SDK_PATH)/include -I$(SDK_PATH)/lwip/include
BUILD_FLAGS = -c -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections BUILD_FLAGS = -c -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections
BUILD_DEFINES = -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ -DLWIP_OPEN_SRC BUILD_DEFINES = -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ -DLWIP_OPEN_SRC
ifdef WITH_DEBUG_PREFIX_MAP
EXTRA_FLAGS = -fdebug-prefix-map=$(PWD)= -fdebug-prefix-map=$(TOOLCHAIN_DIR)=xtensa-lx106-elf -gno-record-gcc-switches
endif
CC=$(TOOLS_PATH)gcc CC=$(TOOLS_PATH)gcc
AR=$(TOOLS_PATH)ar AR=$(TOOLS_PATH)ar
@ -18,7 +23,7 @@ $(BUILD_PATH)/%.h:
$(BUILD_PATH)/%.o: %.c $(BUILD_PATH)/%.o: %.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(CC) $(BUILD_FLAGS) $(BUILD_DEFINES) $(LWIP_INCLUDE) $< -o $@ $(CC) $(BUILD_FLAGS) $(BUILD_DEFINES) $(LWIP_INCLUDE) $(EXTRA_FLAGS) $< -o $@
$(LWIP_LIB): $(BUILD_PATH)/user_config.h $(LWIP_SRCS) $(LWIP_LIB): $(BUILD_PATH)/user_config.h $(LWIP_SRCS)
$(AR) cru $(LWIP_LIB) $(LWIP_SRCS) $(AR) cru $(LWIP_LIB) $(LWIP_SRCS)