From fa6f8054ebee54c3c3f4096b68b7dfd276ee63fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Lled=C3=B3?= <jlledom@member.fsf.org>
Date: Wed, 24 Jul 2019 18:58:08 +0200
Subject: [PATCH] Move LWIP_MARK_TCPIP_THREAD to include/lwip/sys.h

* LWIP_MARK_TCPIP_THREAD moved to include/lwip/sys.h
* Unix port macro definitions moved to sys_arch.h
  * LWIP_MARK_TCPIP_THREAD
  * LOCK_TCPIP_CORE
  * UNLOCK_TCPIP_CORE

(goldsimon@gmx.de: fixed unix Makefile build and win32 build)
Signed-off-by: Simon Goldschmidt <goldsimon@gmx.de>
---
 contrib/examples/example_app/lwipopts.h         |  9 ---------
 contrib/ports/unix/lib/lwipopts.h               |  9 ---------
 contrib/ports/unix/port/include/arch/sys_arch.h | 16 ++++++++++++++++
 contrib/ports/win32/include/arch/sys_arch.h     | 11 +++++++++++
 src/include/lwip/opt.h                          |  9 +--------
 src/include/lwip/sys.h                          | 10 ++++++++++
 6 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/contrib/examples/example_app/lwipopts.h b/contrib/examples/example_app/lwipopts.h
index 664027c5..4721a795 100644
--- a/contrib/examples/example_app/lwipopts.h
+++ b/contrib/examples/example_app/lwipopts.h
@@ -315,15 +315,6 @@ a lot of data that needs to be copied, this should be set high. */
 #if !defined(NO_SYS) || !NO_SYS /* default is 0 */
 void sys_check_core_locking(void);
 #define LWIP_ASSERT_CORE_LOCKED()  sys_check_core_locking()
-void sys_mark_tcpip_thread(void);
-#define LWIP_MARK_TCPIP_THREAD()   sys_mark_tcpip_thread()
-
-#if !defined(LWIP_TCPIP_CORE_LOCKING) || LWIP_TCPIP_CORE_LOCKING /* default is 1 */
-void sys_lock_tcpip_core(void);
-#define LOCK_TCPIP_CORE()          sys_lock_tcpip_core()
-void sys_unlock_tcpip_core(void);
-#define UNLOCK_TCPIP_CORE()        sys_unlock_tcpip_core()
-#endif
 #endif
 
 #ifndef LWIP_PLATFORM_ASSERT
diff --git a/contrib/ports/unix/lib/lwipopts.h b/contrib/ports/unix/lib/lwipopts.h
index 660f7f70..734558a3 100644
--- a/contrib/ports/unix/lib/lwipopts.h
+++ b/contrib/ports/unix/lib/lwipopts.h
@@ -431,15 +431,6 @@
 #if !NO_SYS
 void sys_check_core_locking(void);
 #define LWIP_ASSERT_CORE_LOCKED()  sys_check_core_locking()
-void sys_mark_tcpip_thread(void);
-#define LWIP_MARK_TCPIP_THREAD()   sys_mark_tcpip_thread()
-
-#if LWIP_TCPIP_CORE_LOCKING
-void sys_lock_tcpip_core(void);
-#define LOCK_TCPIP_CORE()          sys_lock_tcpip_core()
-void sys_unlock_tcpip_core(void);
-#define UNLOCK_TCPIP_CORE()        sys_unlock_tcpip_core()
-#endif
 #endif
 
 #endif /* LWIP_LWIPOPTS_H */
diff --git a/contrib/ports/unix/port/include/arch/sys_arch.h b/contrib/ports/unix/port/include/arch/sys_arch.h
index 416b716c..422104a2 100644
--- a/contrib/ports/unix/port/include/arch/sys_arch.h
+++ b/contrib/ports/unix/port/include/arch/sys_arch.h
@@ -62,4 +62,20 @@ typedef struct sys_thread * sys_thread_t;
 #define LWIP_EXAMPLE_APP_ABORT() lwip_unix_keypressed()
 int lwip_unix_keypressed(void);
 
+/*
+   ---------------------------------------
+   ---------- Threading options ----------
+   ---------------------------------------
+*/
+
+void sys_mark_tcpip_thread(void);
+#define LWIP_MARK_TCPIP_THREAD()   sys_mark_tcpip_thread()
+
+#if LWIP_TCPIP_CORE_LOCKING
+void sys_lock_tcpip_core(void);
+#define LOCK_TCPIP_CORE()          sys_lock_tcpip_core()
+void sys_unlock_tcpip_core(void);
+#define UNLOCK_TCPIP_CORE()        sys_unlock_tcpip_core()
+#endif
+
 #endif /* LWIP_ARCH_SYS_ARCH_H */
diff --git a/contrib/ports/win32/include/arch/sys_arch.h b/contrib/ports/win32/include/arch/sys_arch.h
index 037f9783..ded10284 100644
--- a/contrib/ports/win32/include/arch/sys_arch.h
+++ b/contrib/ports/win32/include/arch/sys_arch.h
@@ -77,4 +77,15 @@ void sys_arch_netconn_sem_free(void);
 #define LWIP_EXAMPLE_APP_ABORT() lwip_win32_keypressed()
 int lwip_win32_keypressed(void);
 
+/* Threading options */
+void sys_mark_tcpip_thread(void);
+#define LWIP_MARK_TCPIP_THREAD()   sys_mark_tcpip_thread()
+
+#if LWIP_TCPIP_CORE_LOCKING
+void sys_lock_tcpip_core(void);
+#define LOCK_TCPIP_CORE()          sys_lock_tcpip_core()
+void sys_unlock_tcpip_core(void);
+#define UNLOCK_TCPIP_CORE()        sys_unlock_tcpip_core()
+#endif
+
 #endif /* LWIP_ARCH_SYS_ARCH_H */
diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index c4a1298f..488adf63 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -227,14 +227,7 @@
 #define LWIP_ASSERT_CORE_LOCKED()
 #endif
 
-/**
- * Called as first thing in the lwIP TCPIP thread. Can be used in conjunction
- * with @ref LWIP_ASSERT_CORE_LOCKED to check core locking.
- * @see @ref multithreading
- */
-#if !defined LWIP_MARK_TCPIP_THREAD || defined __DOXYGEN__
-#define LWIP_MARK_TCPIP_THREAD()
-#endif
+
 /**
  * @}
  */
diff --git a/src/include/lwip/sys.h b/src/include/lwip/sys.h
index cf13e1dc..4604eb25 100644
--- a/src/include/lwip/sys.h
+++ b/src/include/lwip/sys.h
@@ -421,6 +421,16 @@ sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg,
 
 #endif /* NO_SYS */
 
+/**
+ * @ingroup lwip_opts_lock
+ * Called as first thing in the lwIP TCPIP thread. Can be used in conjunction
+ * with @ref LWIP_ASSERT_CORE_LOCKED to check core locking.
+ * @see @ref multithreading
+ */
+#if !defined LWIP_MARK_TCPIP_THREAD || defined __DOXYGEN__
+#define LWIP_MARK_TCPIP_THREAD()
+#endif
+
 /**
  * @ingroup sys_misc
  * sys_init() must be called before anything else.