mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
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>
This commit is contained in:
parent
8291ff3dc0
commit
fa6f8054eb
@ -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 */
|
#if !defined(NO_SYS) || !NO_SYS /* default is 0 */
|
||||||
void sys_check_core_locking(void);
|
void sys_check_core_locking(void);
|
||||||
#define LWIP_ASSERT_CORE_LOCKED() sys_check_core_locking()
|
#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
|
#endif
|
||||||
|
|
||||||
#ifndef LWIP_PLATFORM_ASSERT
|
#ifndef LWIP_PLATFORM_ASSERT
|
||||||
|
@ -431,15 +431,6 @@
|
|||||||
#if !NO_SYS
|
#if !NO_SYS
|
||||||
void sys_check_core_locking(void);
|
void sys_check_core_locking(void);
|
||||||
#define LWIP_ASSERT_CORE_LOCKED() sys_check_core_locking()
|
#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
|
||||||
|
|
||||||
#endif /* LWIP_LWIPOPTS_H */
|
#endif /* LWIP_LWIPOPTS_H */
|
||||||
|
@ -62,4 +62,20 @@ typedef struct sys_thread * sys_thread_t;
|
|||||||
#define LWIP_EXAMPLE_APP_ABORT() lwip_unix_keypressed()
|
#define LWIP_EXAMPLE_APP_ABORT() lwip_unix_keypressed()
|
||||||
int lwip_unix_keypressed(void);
|
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 */
|
#endif /* LWIP_ARCH_SYS_ARCH_H */
|
||||||
|
@ -77,4 +77,15 @@ void sys_arch_netconn_sem_free(void);
|
|||||||
#define LWIP_EXAMPLE_APP_ABORT() lwip_win32_keypressed()
|
#define LWIP_EXAMPLE_APP_ABORT() lwip_win32_keypressed()
|
||||||
int lwip_win32_keypressed(void);
|
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 */
|
#endif /* LWIP_ARCH_SYS_ARCH_H */
|
||||||
|
@ -227,14 +227,7 @@
|
|||||||
#define LWIP_ASSERT_CORE_LOCKED()
|
#define LWIP_ASSERT_CORE_LOCKED()
|
||||||
#endif
|
#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
|
|
||||||
/**
|
/**
|
||||||
* @}
|
* @}
|
||||||
*/
|
*/
|
||||||
|
@ -421,6 +421,16 @@ sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg,
|
|||||||
|
|
||||||
#endif /* NO_SYS */
|
#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
|
* @ingroup sys_misc
|
||||||
* sys_init() must be called before anything else.
|
* sys_init() must be called before anything else.
|
||||||
|
Loading…
Reference in New Issue
Block a user