diff --git a/_projects/ia32-generic-qemu/lwip/lwipopts.h b/_projects/ia32-generic-qemu/lwip/lwipopts.h index b12ca7f37..fa25fd49a 100644 --- a/_projects/ia32-generic-qemu/lwip/lwipopts.h +++ b/_projects/ia32-generic-qemu/lwip/lwipopts.h @@ -1,52 +1,53 @@ -#define LWIP_TCPIP_CORE_LOCKING 1 -#define LWIP_SUPPORT_CUSTOM_PBUF 1 -#define LWIP_NETIF_LOOPBACK 1 -#define LWIP_HAVE_SLIPIF 0 -#define LWIP_NETIF_API 1 -#define LWIP_SOCKET 1 -#define LWIP_COMPAT_SOCKETS 0 -#define LWIP_ARP 1 -#define LWIP_ICMP 1 -#define LWIP_RAW 1 -#define LWIP_DHCP 1 -#define LWIP_DNS 1 -#define LWIP_AUTOIP 1 -#define LWIP_UDP 1 -#define LWIP_TCP 1 -#define LWIP_TCP_KEEPALIVE 1 -#define MEM_LIBC_MALLOC 1 -#define MEMP_MEM_MALLOC 1 -#define LWIP_ERRNO_INCLUDE "errno.h" -#define LWIP_DNS_API_DEFINE_ERRORS 0 -#define LWIP_DNS_API_DEFINE_FLAGS 0 +#define LWIP_TCPIP_CORE_LOCKING 1 +#define LWIP_SUPPORT_CUSTOM_PBUF 1 +#define LWIP_NETIF_LOOPBACK 1 +#define LWIP_HAVE_SLIPIF 0 +#define LWIP_NETIF_API 1 +#define LWIP_SOCKET 1 +#define LWIP_COMPAT_SOCKETS 0 +#define LWIP_ARP 1 +#define LWIP_ICMP 1 +#define LWIP_RAW 1 +#define LWIP_NETPACKET 1 +#define LWIP_DHCP 1 +#define LWIP_DNS 1 +#define LWIP_AUTOIP 1 +#define LWIP_UDP 1 +#define LWIP_TCP 1 +#define LWIP_TCP_KEEPALIVE 1 +#define MEM_LIBC_MALLOC 1 +#define MEMP_MEM_MALLOC 1 +#define LWIP_ERRNO_INCLUDE "errno.h" +#define LWIP_DNS_API_DEFINE_ERRORS 0 +#define LWIP_DNS_API_DEFINE_FLAGS 0 #define LWIP_DNS_API_DECLARE_STRUCTS 0 #define LWIP_DNS_API_DECLARE_H_ERRNO 0 -#define MEMP_NUM_NETCONN 1024 -#define PPP_SUPPORT 1 -#define PPPOS_SUPPORT 1 -#define PAP_SUPPORT 1 -#define CHAP_SUPPORT 1 -#define MSCHAP_SUPPORT 1 -#define LWIP_TIMEVAL_PRIVATE 0 +#define MEMP_NUM_NETCONN 1024 +#define PPP_SUPPORT 1 +#define PPPOS_SUPPORT 1 +#define PAP_SUPPORT 1 +#define CHAP_SUPPORT 1 +#define MSCHAP_SUPPORT 1 +#define LWIP_TIMEVAL_PRIVATE 0 -#define LWIP_IPV6 1 -#define LWIP_IPV6_AUTOCONFIG 1 +#define LWIP_IPV6 1 +#define LWIP_IPV6_AUTOCONFIG 1 #define LWIP_IFSTATUS_DEV_BUFFER_SIZE 1024 -#if 0 // debugging LWiP PPPoS -#define LWIP_DEBUG 1 +#if 0 // debugging LWiP PPPoS +#define LWIP_DEBUG 1 #define LWIP_DBG_MIN_LEVEL LWIP_DBG_LEVEL_ALL -#define LWIP_DBG_TYPES_ON LWIP_DBG_ON -#define PPP_DEBUG LWIP_DBG_ON +#define LWIP_DBG_TYPES_ON LWIP_DBG_ON +#define PPP_DEBUG LWIP_DBG_ON #endif #if 0 -#define LWIP_DEBUG 1 +#define LWIP_DEBUG 1 #define LWIP_DBG_MIN_LEVEL LWIP_DBG_LEVEL_ALL -#define LWIP_DBG_TYPES_ON LWIP_DBG_ON -#define PBUF_DEBUG LWIP_DBG_OFF -#define SOCKETS_DEBUG LWIP_DBG_ON +#define LWIP_DBG_TYPES_ON LWIP_DBG_ON +#define PBUF_DEBUG LWIP_DBG_OFF +#define SOCKETS_DEBUG LWIP_DBG_ON #endif #ifndef LWIP_STATS @@ -68,26 +69,26 @@ #define SYS_STATS 1 #endif /* LWIP_STATS */ -#define TCP_MSS 1460 -#define TCP_WND (32 * TCP_MSS) -#define TCP_SND_BUF TCP_WND -#define ETH_PAD_SIZE 2 -#define ETHARP_TABLE_MATCH_NETIF 1 -#define IP_REASSEMBLY 1 -#define IP_FRAG 1 -#define SO_REUSE 1 -#define DEFAULT_THREAD_STACKSIZE (4 * 4096) -#define TCPIP_THREAD_STACKSIZE (4 * 4096) -#define TCPIP_THREAD_PRIO 3 -#define TCPIP_MBOX_SIZE 256 -#define DEFAULT_RAW_RECVMBOX_SIZE 32 -#define DEFAULT_UDP_RECVMBOX_SIZE 32 -#define DEFAULT_TCP_RECVMBOX_SIZE 32 -#define DEFAULT_ACCEPTMBOX_SIZE 32 -#define LWIP_HOOK_FILENAME "phoenix-hooks.h" -#define LWIP_EXT_PF 1 -#define LWIP_NETIF_STATUS_CALLBACK 1 -#define LWIP_DHCP_AUTOIP_COOP 1 +#define TCP_MSS 1460 +#define TCP_WND (32 * TCP_MSS) +#define TCP_SND_BUF TCP_WND +#define ETH_PAD_SIZE 2 +#define ETHARP_TABLE_MATCH_NETIF 1 +#define IP_REASSEMBLY 1 +#define IP_FRAG 1 +#define SO_REUSE 1 +#define DEFAULT_THREAD_STACKSIZE (4 * 4096) +#define TCPIP_THREAD_STACKSIZE (4 * 4096) +#define TCPIP_THREAD_PRIO 3 +#define TCPIP_MBOX_SIZE 256 +#define DEFAULT_RAW_RECVMBOX_SIZE 32 +#define DEFAULT_UDP_RECVMBOX_SIZE 32 +#define DEFAULT_TCP_RECVMBOX_SIZE 32 +#define DEFAULT_ACCEPTMBOX_SIZE 32 +#define LWIP_HOOK_FILENAME "phoenix-hooks.h" +#define LWIP_EXT_PF 1 +#define LWIP_NETIF_STATUS_CALLBACK 1 +#define LWIP_DHCP_AUTOIP_COOP 1 #define LWIP_DHCP_AUTOIP_COOP_TRIES 3 -#define LWIP_SO_RCVTIMEO 1 -#define ifreq lwip_ifreq +#define LWIP_SO_RCVTIMEO 1 +#define ifreq lwip_ifreq diff --git a/libphoenix b/libphoenix index 755e3eac2..480f66a09 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 755e3eac2f4c3aa6517c3aae99b10936bb373568 +Subproject commit 480f66a0921c164f9b388852f1298ce00d33e24d diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index e35fd78ec..57e992f26 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit e35fd78ecc48b0957fedb99950f1f7f214cb00e9 +Subproject commit 57e992f269125abda33933915df1583cb7c03eed diff --git a/phoenix-rtos-lwip b/phoenix-rtos-lwip index 8d0b26fee..802e7ba9d 160000 --- a/phoenix-rtos-lwip +++ b/phoenix-rtos-lwip @@ -1 +1 @@ -Subproject commit 8d0b26fee495b1cc4488c90f0b4c874c0162c76e +Subproject commit 802e7ba9dba70e63cb0882fbe66c3783b963cc8c diff --git a/phoenix-rtos-ports b/phoenix-rtos-ports index 0c97d59ac..d87156c54 160000 --- a/phoenix-rtos-ports +++ b/phoenix-rtos-ports @@ -1 +1 @@ -Subproject commit 0c97d59ac88a062a2b1887737f2c19cf41b55ebf +Subproject commit d87156c54d0890bdbebb1486794268adda288360 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 648963930..ec10d1a62 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 648963930de0e4e599ab26b1ea6921685a0f803a +Subproject commit ec10d1a629a4f8853da635305d6eb252f327e9d7