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

revert some changes and fix wl_definitions

Browse Source
This commit is contained in:
Me No Dev 2015-12-22 12:51:28 +02:00
parent c1711aa73d
commit 7e8e535d3f
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cores/esp8266/libc_replacements.c
View File

@ -39,16 +39,6 @@
#include "user_interface.h" #include "user_interface.h"
#include "debug.h" #include "debug.h"
extern void *__real_pvPortMalloc(size_t xWantedSize, const char* file, int line);
extern void *__wrap_pvPortMalloc(size_t xWantedSize, const char* file, int line){
return __real_pvPortMalloc(((xWantedSize + 3) & ~((size_t)0x3)), file, line);
}
extern void *__real_pvPortRealloc(void* ptr, size_t xWantedSize, const char* file, int line);
extern void *__wrap_pvPortRealloc(void* ptr, size_t xWantedSize, const char* file, int line){
return __real_pvPortRealloc(ptr, ((xWantedSize + 3) & ~((size_t)0x3)), file, line);
}
void* ICACHE_RAM_ATTR malloc(size_t size) { void* ICACHE_RAM_ATTR malloc(size_t size) {
size = ((size + 3) & ~((size_t)0x3)); size = ((size + 3) & ~((size_t)0x3));
return os_malloc(size); return os_malloc(size);

18
libraries/ESP8266WiFi/src/include/wl_definitions.h
View File

@ -68,4 +68,22 @@ enum wl_enc_type { /* Values map to 802.11 encryption suites... */
ENC_TYPE_AUTO = 8 ENC_TYPE_AUTO = 8
}; };
#ifndef __LWIP_TCP_H__
#ifndef LWIP_INTERNAL
enum wl_tcp_state {
CLOSED = 0,
LISTEN = 1,
SYN_SENT = 2,
SYN_RCVD = 3,
ESTABLISHED = 4,
FIN_WAIT_1 = 5,
FIN_WAIT_2 = 6,
CLOSE_WAIT = 7,
CLOSING = 8,
LAST_ACK = 9,
TIME_WAIT = 10
};
#endif
#endif
#endif /* WL_DEFINITIONS_H_ */ #endif /* WL_DEFINITIONS_H_ */

2
platform.txt
View File

@ -27,7 +27,7 @@ compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implici
compiler.S.cmd=xtensa-lx106-elf-gcc compiler.S.cmd=xtensa-lx106-elf-gcc
compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,register_chipv6_phy -Wl,-wrap,pvPortMalloc -Wl,-wrap,pvPortRealloc compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,register_chipv6_phy
compiler.c.elf.cmd=xtensa-lx106-elf-gcc compiler.c.elf.cmd=xtensa-lx106-elf-gcc
compiler.c.elf.libs=-lm -lgcc -lhal -lphy -lpp -lnet80211 -llwip -lwpa -lcrypto -lmain -lwps -laxtls -lsmartconfig -lmesh compiler.c.elf.libs=-lm -lgcc -lhal -lphy -lpp -lnet80211 -llwip -lwpa -lcrypto -lmain -lwps -laxtls -lsmartconfig -lmesh