Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with esp82xx-nonos-linklayer #9078

Merged
merged 3 commits into from
Feb 11, 2024
Merged

Sync with esp82xx-nonos-linklayer #9078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0b8520
Update lwip2 builder
mcspr Feb 3, 2024
69bc8fe
Rebuild lwip2 libs
mcspr Feb 3, 2024
3123a68
Merge branch 'master' into lwip2/build-2024_02_03T13_28_00_00
mcspr Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified tools/sdk/lib/liblwip2-1460-feat.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip2-1460.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip2-536-feat.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip2-536.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip6-1460-feat.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip6-536-feat.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/sdk/lwip2/builder
Open in desktop
Submodule builder updated 5 files
+1 −6 glue-esp/lwip-esp.c
+16 −12 glue-lwip/arduino/lwipopts.h
+5 −5 glue-lwip/esp-ping.c
+3 −14 glue-lwip/lwip-git.c
+32 −22 glue-lwip/open/lwipopts.h
2 changes: 1 addition & 1 deletion tools/sdk/lwip2/include/lwip-git-hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// generated by makefiles/make-lwip2-hash
#ifndef LWIP_HASH_H
#define LWIP_HASH_H
#define LWIP_HASH_STR "STABLE-2_1_3_RELEASE/glue:1.2-67-g8e3c4ee"
#define LWIP_HASH_STR "STABLE-2_1_3_RELEASE/glue:1.2-70-g4087efd"
#endif // LWIP_HASH_H
28 changes: 16 additions & 12 deletions tools/sdk/lwip2/include/lwipopts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
#define __CUSTOM_EXTRA_DEFINES__

#endif

#ifndef MYLWIPOPTS_H
#define MYLWIPOPTS_H

// opt.h version lwip-2.1.0rc1 for esp8266
/* opt.h version lwip-2.1.3 for esp8266 */

/**
* @file
Expand Down Expand Up @@ -996,7 +995,7 @@
#if !LWIP_IPV4
/* disable AUTOIP when IPv4 is disabled */
#undef LWIP_AUTOIP
#define LWIP_AUTOIP 0
#define LWIP_AUTOIP 0
#endif /* !LWIP_IPV4 */

/**
Expand Down Expand Up @@ -1564,7 +1563,7 @@
* LWIP_PBUF_REF_T: Refcount type in pbuf.
* Default width of u8_t can be increased if 255 refs are not enough for you.
*/
#ifndef LWIP_PBUF_REF_T
#if !defined LWIP_PBUF_REF_T || defined __DOXYGEN__
#define LWIP_PBUF_REF_T u8_t
#endif

Expand Down Expand Up @@ -2447,7 +2446,7 @@
* LWIP_IPV6_FORWARD==1: Forward IPv6 packets across netifs
*/
#if !defined LWIP_IPV6_FORWARD || defined __DOXYGEN__
#define LWIP_IPV6_FORWARD 0 // 0
#define LWIP_IPV6_FORWARD 0
#endif

/**
Expand Down Expand Up @@ -2683,7 +2682,7 @@
* servers to the DNS module.
*/
#if !defined LWIP_ND6_RDNSS_MAX_DNS_SERVERS || defined __DOXYGEN__
#define LWIP_ND6_RDNSS_MAX_DNS_SERVERS 0 // 0
#define LWIP_ND6_RDNSS_MAX_DNS_SERVERS 0
#endif
/**
* @}
Expand Down Expand Up @@ -2722,7 +2721,7 @@
* void dhcp6_set_ntp_servers(u8_t num_ntp_servers, ip_addr_t* ntp_server_addrs);
*/
#if !defined LWIP_DHCP6_GET_NTP_SRV || defined __DOXYGEN__
#define LWIP_DHCP6_GET_NTP_SRV 1 // with 1: dhcp6_set_ntp_servers() must be implemented
#define LWIP_DHCP6_GET_NTP_SRV 1
#endif

/**
Expand Down Expand Up @@ -3509,9 +3508,6 @@
#if !defined DHCP6_DEBUG || defined __DOXYGEN__
#define DHCP6_DEBUG LWIP_DBG_OFF
#endif
/**
* @}
*/

/**
* NAPT_DEBUG: Enable debugging for NAPT.
Expand All @@ -3520,6 +3516,10 @@
#define NAPT_DEBUG LWIP_DBG_OFF
#endif

/**
* @}
*/

/**
* LWIP_TESTMODE: Changes to make unit test possible
*/
Expand Down Expand Up @@ -3566,9 +3566,13 @@
#define PPPOS_SUPPORT IP_NAPT // because we don't have proxyarp yet
#define PPP_SUPPORT PPPOS_SUPPORT
#define PPP_SERVER 1
#define PPP_DEBUG ULWIPDEBUG
#define PRINTPKT_SUPPORT ULWIPDEBUG

#if ULWIPDEBUG
#define PPP_DEBUG LWIP_DBG_ON
#define PING_DEBUG LWIP_DBG_ON
#endif

#ifdef __cplusplus
extern "C" {
#endif
Expand Down Expand Up @@ -3710,4 +3714,4 @@ void tcp_kill_timewait (void);
} // extern "C"
#endif

#endif // MYLWIPOPTS_H
#endif /* MYLWIPOPTS_H */