From 2aa1e73ff912052ea73ac88ea6bc734c041c1ea0 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Thu, 23 Jun 2022 14:31:04 +0800 Subject: [PATCH 1/2] [TTY] remove mutex_lock/unlock in tty. --- components/drivers/tty/n_tty.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/components/drivers/tty/n_tty.c b/components/drivers/tty/n_tty.c index 06bd64d6be..5a723f0cc7 100644 --- a/components/drivers/tty/n_tty.c +++ b/components/drivers/tty/n_tty.c @@ -49,27 +49,6 @@ #define ECHO_BLOCK 256 #define ECHO_DISCARD_WATERMARK RT_TTY_BUF - (ECHO_BLOCK + 32) -void mutex_lock(rt_mutex_t mutex) -{ - rt_err_t result = -RT_EBUSY; - - while (result == -RT_EBUSY) - { - result = rt_mutex_take(mutex, RT_WAITING_FOREVER); - } - - if (result != RT_EOK) - { - RT_ASSERT(0); - } - return; -} - -void mutex_unlock(rt_mutex_t mutex) -{ - rt_mutex_release(mutex); - return; -} struct n_tty_data { /* producer-published */ -- Gitee From 415f0d43bf29b98c3c0f78d56dec33c5bd0a2399 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Thu, 23 Jun 2022 14:31:57 +0800 Subject: [PATCH 2/2] [lwP] Add more dependency for lwP config. --- components/lwp/Kconfig | 5 +++++ components/net/Kconfig | 1 + 2 files changed, 6 insertions(+) diff --git a/components/lwp/Kconfig b/components/lwp/Kconfig index 26f83ead98..da62bb0c64 100644 --- a/components/lwp/Kconfig +++ b/components/lwp/Kconfig @@ -3,6 +3,11 @@ menuconfig RT_USING_LWP select RT_USING_DFS select RT_USING_LIBC select RT_USING_POSIX_CLOCKTIME + select RT_USING_TTY + select RT_USING_NULL + select RT_USING_ZERO + select RT_USING_RANDOM + select RT_USING_RTC depends on ARCH_ARM_CORTEX_M || ARCH_ARM_ARM9 || ARCH_ARM_CORTEX_A || ARCH_RISCV64 default n help diff --git a/components/net/Kconfig b/components/net/Kconfig index 6411cc5e0c..cfe7fbca68 100644 --- a/components/net/Kconfig +++ b/components/net/Kconfig @@ -44,6 +44,7 @@ config RT_USING_SAL config SAL_USING_AF_UNIX bool "Enable support AF_UNIX socket" default n + default y if RT_USING_LWP select LWIP_NETIF_LINK_CALLBACK if !SAL_USING_POSIX -- Gitee