lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

net/route: Remove net_init_fileroute

Browse source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-03-12 12:39:09 +08:00 committed by Petro Karashchenko
parent 7028531e74
commit 19ec0b4fe3
3 changed files with 2 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
net/route/fileroute.h
View file

@ -46,25 +46,6 @@
struct file; /* Forward reference */
/****************************************************************************
* Name: net_init_fileroute
*
* Description:
* Initialize the in-memory, RAM routing table
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
* Assumptions:
* Called early in initialization so that no special protection is needed.
*
****************************************************************************/
void net_init_fileroute(void);
/****************************************************************************
* Name: net_openroute_ipv4/net_openroute_ipv6
*

34
net/route/net_fileroute.c
View file

@ -56,7 +56,7 @@
#ifdef CONFIG_ROUTE_IPv4_FILEROUTE
/* Semaphore used to lock a routing table for exclusive write-only access */
static sem_t g_ipv4_exclsem;
static sem_t g_ipv4_exclsem = SEM_INITIALIZER(1);
static pid_t g_ipv4_holder = NO_HOLDER;
static int g_ipv4_count;
#endif
@ -64,7 +64,7 @@ static int g_ipv4_count;
#ifdef CONFIG_ROUTE_IPv6_FILEROUTE
/* Semaphore used to lock a routing table for exclusive write-only access */
static sem_t g_ipv6_exclsem;
static sem_t g_ipv6_exclsem = SEM_INITIALIZER(1);
static pid_t g_ipv6_holder = NO_HOLDER;
static int g_ipv6_count;
#endif
@ -180,36 +180,6 @@ int net_routesize(FAR const char *path, size_t entrysize)
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: net_init_fileroute
*
* Description:
* Initialize the in-memory, RAM routing table
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
* Assumptions:
* Called early in initialization so that no special protection is needed.
*
****************************************************************************/
void net_init_fileroute(void)
{
/* Initialize semaphores */
#ifdef CONFIG_ROUTE_IPv4_FILEROUTE
nxsem_init(&g_ipv4_exclsem, 0, 1);
#endif
#ifdef CONFIG_ROUTE_IPv6_FILEROUTE
nxsem_init(&g_ipv6_exclsem, 0, 1);
#endif
}
/****************************************************************************
* Name: net_openroute_ipv4/net_openroute_ipv6
*

5
net/route/net_initroute.c
View file

@ -25,7 +25,6 @@
#include <nuttx/config.h>
#include "route/ramroute.h"
#include "route/fileroute.h"
#include "route/cacheroute.h"
#include "route/route.h"
@ -55,10 +54,6 @@ void net_init_route(void)
net_init_ramroute();
#endif
#if defined(CONFIG_ROUTE_IPv4_FILEROUTE) || defined(CONFIG_ROUTE_IPv6_FILEROUTE)
net_init_fileroute();
#endif
#if defined(CONFIG_ROUTE_IPv4_CACHEROUTE) || defined(CONFIG_ROUTE_IPv6_CACHEROUTE)
net_init_cacheroute();
#endif