Keepup with Zephyr project's enjoyment of changing headers

cesanta · Apr 4, 2024 · 6ff0f9c · 6ff0f9c
1 parent 9276f76
commit 6ff0f9c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 2 deletions.
diff --git a/examples/zephyr/device-dashboard/prj.conf b/examples/zephyr/device-dashboard/prj.conf
@@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_POLL_MAX=32
+CONFIG_POSIX_API=y
 CONFIG_POSIX_MAX_FDS=32
 CONFIG_NET_MAX_CONN=10
 CONFIG_NET_MAX_CONTEXTS=10

diff --git a/examples/zephyr/http-client/prj.conf b/examples/zephyr/http-client/prj.conf
@@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_POLL_MAX=32
+CONFIG_POSIX_API=y
 CONFIG_POSIX_MAX_FDS=32
 CONFIG_NET_CONFIG_SETTINGS=y
 CONFIG_NET_CONNECTION_MANAGER=y

diff --git a/examples/zephyr/http-server/prj.conf b/examples/zephyr/http-server/prj.conf
@@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_POLL_MAX=32
+CONFIG_POSIX_API=y
 CONFIG_POSIX_MAX_FDS=32
 CONFIG_NET_CONFIG_SETTINGS=y
 CONFIG_NET_CONNECTION_MANAGER=y

diff --git a/examples/zephyr/mqtt-aws-client/prj.conf b/examples/zephyr/mqtt-aws-client/prj.conf
@@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_POLL_MAX=32
+CONFIG_POSIX_API=y
 CONFIG_POSIX_MAX_FDS=32
 CONFIG_NET_CONFIG_SETTINGS=y
 CONFIG_NET_CONNECTION_MANAGER=y

diff --git a/examples/zephyr/websocket-server/prj.conf b/examples/zephyr/websocket-server/prj.conf
@@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_POLL_MAX=32
+CONFIG_POSIX_API=y
 CONFIG_POSIX_MAX_FDS=32
 CONFIG_NET_CONFIG_SETTINGS=y
 CONFIG_NET_CONNECTION_MANAGER=y

diff --git a/mongoose.h b/mongoose.h
@@ -522,8 +522,9 @@ typedef int socklen_t;
 
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr/posix/fcntl.h>
 #include <zephyr/net/socket.h>
+#include <zephyr/posix/fcntl.h>
+#include <zephyr/posix/sys/select.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -2919,6 +2920,14 @@ struct mg_tcpip_driver_tm4c_data {
 
 #endif
 
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_W5500) && MG_ENABLE_DRIVER_W5500
+
+#undef MG_ENABLE_TCPIP_DRIVER_INIT
+#define MG_ENABLE_TCPIP_DRIVER_INIT 0
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/arch_zephyr.h b/src/arch_zephyr.h
@@ -6,8 +6,9 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr/posix/fcntl.h>
 #include <zephyr/net/socket.h>
+#include <zephyr/posix/fcntl.h>
+#include <zephyr/posix/sys/select.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>