You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/03/12 17:24:27 UTC
[incubator-nuttx] 01/07: net: Remove net_lockinitialize
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9c1fc8da4e97cdb6e57cfeb3b5c9a664962d0040
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Mar 12 12:14:11 2022 +0800
net: Remove net_lockinitialize
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
net/net_initialize.c | 5 -----
net/utils/net_lock.c | 19 +++----------------
net/utils/utils.h | 10 ----------
3 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/net/net_initialize.c b/net/net_initialize.c
index 6836989..fa1a3be 100644
--- a/net/net_initialize.c
+++ b/net/net_initialize.c
@@ -47,7 +47,6 @@
#include "igmp/igmp.h"
#include "route/route.h"
#include "usrsock/usrsock.h"
-#include "utils/utils.h"
/****************************************************************************
* Public Functions
@@ -78,10 +77,6 @@
void net_initialize(void)
{
- /* Initialize the locking facility */
-
- net_lockinitialize();
-
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_6LOWPAN
/* Initialize 6LoWPAN data structures */
diff --git a/net/utils/net_lock.c b/net/utils/net_lock.c
index 91666c5..db2af19 100644
--- a/net/utils/net_lock.c
+++ b/net/utils/net_lock.c
@@ -49,9 +49,9 @@
* Private Data
****************************************************************************/
-static sem_t g_netlock;
-static pid_t g_holder = NO_HOLDER;
-static unsigned int g_count = 0;
+static sem_t g_netlock = SEM_INITIALIZER(1);
+static pid_t g_holder = NO_HOLDER;
+static unsigned int g_count;
/****************************************************************************
* Private Functions
@@ -150,19 +150,6 @@ _net_timedwait(sem_t *sem, bool interruptible, unsigned int timeout)
****************************************************************************/
/****************************************************************************
- * Name: net_lockinitialize
- *
- * Description:
- * Initialize the locking facility
- *
- ****************************************************************************/
-
-void net_lockinitialize(void)
-{
- nxsem_init(&g_netlock, 0, 1);
-}
-
-/****************************************************************************
* Name: net_lock
*
* Description:
diff --git a/net/utils/utils.h b/net/utils/utils.h
index 5004b5e..06d6d3a 100644
--- a/net/utils/utils.h
+++ b/net/utils/utils.h
@@ -62,16 +62,6 @@ struct net_driver_s; /* Forward reference */
struct timeval; /* Forward reference */
/****************************************************************************
- * Name: net_lockinitialize
- *
- * Description:
- * Initialize the locking facility
- *
- ****************************************************************************/
-
-void net_lockinitialize(void);
-
-/****************************************************************************
* Name: net_breaklock
*
* Description: