From f375a35cc8d5f15c73685741edcf2de4fc31a696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Wed, 20 Jul 2022 21:41:07 +0200
Subject: [PATCH] [core] Move library include wrappers to common

---
 builder/utils/env.py                                         | 1 +
 .../{beken-72xx/fixups/inc => common/fixups/lib_inc}/certs.h | 0
 .../{realtek-ambz/fixups/inc => common/fixups/lib_inc}/err.h | 0
 .../{beken-72xx/fixups/inc => common/fixups/lib_inc}/netdb.h | 0
 platform/common/fixups/lib_inc/netif.h                       | 5 +++++
 .../fixups/inc => common/fixups/lib_inc}/sockets.h           | 0
 .../{realtek-ambz/fixups/inc => common/fixups/lib_inc}/sys.h | 0
 .../fixups/inc => common/fixups/lib_inc}/tcpip.h             | 0
 .../{realtek-ambz/fixups/inc => common/fixups/lib_inc}/udp.h | 2 ++
 platform/realtek-ambz/fixups/inc/sockets.h                   | 5 -----
 10 files changed, 8 insertions(+), 5 deletions(-)
 rename platform/{beken-72xx/fixups/inc => common/fixups/lib_inc}/certs.h (100%)
 rename platform/{realtek-ambz/fixups/inc => common/fixups/lib_inc}/err.h (100%)
 rename platform/{beken-72xx/fixups/inc => common/fixups/lib_inc}/netdb.h (100%)
 create mode 100644 platform/common/fixups/lib_inc/netif.h
 rename platform/{beken-72xx/fixups/inc => common/fixups/lib_inc}/sockets.h (100%)
 rename platform/{realtek-ambz/fixups/inc => common/fixups/lib_inc}/sys.h (100%)
 rename platform/{realtek-ambz/fixups/inc => common/fixups/lib_inc}/tcpip.h (100%)
 rename platform/{realtek-ambz/fixups/inc => common/fixups/lib_inc}/udp.h (90%)
 delete mode 100644 platform/realtek-ambz/fixups/inc/sockets.h

diff --git a/builder/utils/env.py b/builder/utils/env.py
index d999d23..a81de96 100644
--- a/builder/utils/env.py
+++ b/builder/utils/env.py
@@ -51,6 +51,7 @@ def env_add_defaults(env, platform, board):
     env.Prepend(
         CPPPATH=[
             "$LT_DIR/platform/common/fixups",
+            "$LT_DIR/platform/common/fixups/lib_inc",
             "$BOARD_DIR",
             "$FAMILY_DIR/fixups",
             "$PARENT_DIR/fixups",
diff --git a/platform/beken-72xx/fixups/inc/certs.h b/platform/common/fixups/lib_inc/certs.h
similarity index 100%
rename from platform/beken-72xx/fixups/inc/certs.h
rename to platform/common/fixups/lib_inc/certs.h
diff --git a/platform/realtek-ambz/fixups/inc/err.h b/platform/common/fixups/lib_inc/err.h
similarity index 100%
rename from platform/realtek-ambz/fixups/inc/err.h
rename to platform/common/fixups/lib_inc/err.h
diff --git a/platform/beken-72xx/fixups/inc/netdb.h b/platform/common/fixups/lib_inc/netdb.h
similarity index 100%
rename from platform/beken-72xx/fixups/inc/netdb.h
rename to platform/common/fixups/lib_inc/netdb.h
diff --git a/platform/common/fixups/lib_inc/netif.h b/platform/common/fixups/lib_inc/netif.h
new file mode 100644
index 0000000..7f2d421
--- /dev/null
+++ b/platform/common/fixups/lib_inc/netif.h
@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-07-20. */
+
+#pragma once
+
+#include <lwip/netif.h>
diff --git a/platform/beken-72xx/fixups/inc/sockets.h b/platform/common/fixups/lib_inc/sockets.h
similarity index 100%
rename from platform/beken-72xx/fixups/inc/sockets.h
rename to platform/common/fixups/lib_inc/sockets.h
diff --git a/platform/realtek-ambz/fixups/inc/sys.h b/platform/common/fixups/lib_inc/sys.h
similarity index 100%
rename from platform/realtek-ambz/fixups/inc/sys.h
rename to platform/common/fixups/lib_inc/sys.h
diff --git a/platform/realtek-ambz/fixups/inc/tcpip.h b/platform/common/fixups/lib_inc/tcpip.h
similarity index 100%
rename from platform/realtek-ambz/fixups/inc/tcpip.h
rename to platform/common/fixups/lib_inc/tcpip.h
diff --git a/platform/realtek-ambz/fixups/inc/udp.h b/platform/common/fixups/lib_inc/udp.h
similarity index 90%
rename from platform/realtek-ambz/fixups/inc/udp.h
rename to platform/common/fixups/lib_inc/udp.h
index 70524e9..fc3cfa8 100644
--- a/platform/realtek-ambz/fixups/inc/udp.h
+++ b/platform/common/fixups/lib_inc/udp.h
@@ -7,4 +7,6 @@
 // this is included only by wifi_simple_config.c
 // which uses lwip_ntohl without parentheses
 // so the #define from lwip/def.h doesn't work
+#ifndef lwip_ntohl
 #define lwip_ntohl lwip_htonl
+#endif
diff --git a/platform/realtek-ambz/fixups/inc/sockets.h b/platform/realtek-ambz/fixups/inc/sockets.h
deleted file mode 100644
index 3f34b76..0000000
--- a/platform/realtek-ambz/fixups/inc/sockets.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Copyright (c) Kuba Szczodrzyński 2022-05-23. */
-
-#pragma once
-
-#include <lwip/sockets.h>