mirror of
https://github.com/apache/nuttx.git
synced 2026-05-31 14:27:37 +08:00
Eliminate CONFIG_NO_NOINTS. Lots of files changed -> lots of testing needed.
This commit is contained in:
@@ -72,12 +72,11 @@
|
||||
int netdev_count(void)
|
||||
{
|
||||
struct net_driver_s *dev;
|
||||
net_lock_t save;
|
||||
int ndev;
|
||||
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
for (dev = g_netdevices, ndev = 0; dev; dev = dev->flink, ndev++);
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return ndev;
|
||||
}
|
||||
|
||||
|
||||
@@ -76,11 +76,10 @@
|
||||
FAR struct net_driver_s *netdev_default(void)
|
||||
{
|
||||
FAR struct net_driver_s *dev;
|
||||
net_lock_t save;
|
||||
|
||||
/* Examine each registered network device */
|
||||
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
for (dev = g_netdevices; dev; dev = dev->flink)
|
||||
{
|
||||
/* Is the interface in the "up" state? */
|
||||
@@ -91,12 +90,12 @@ FAR struct net_driver_s *netdev_default(void)
|
||||
* state.
|
||||
*/
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return dev;
|
||||
}
|
||||
}
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -82,11 +82,10 @@
|
||||
static FAR struct net_driver_s *netdev_finddevice_ipv4addr(in_addr_t ripaddr)
|
||||
{
|
||||
FAR struct net_driver_s *dev;
|
||||
net_lock_t save;
|
||||
|
||||
/* Examine each registered network device */
|
||||
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
for (dev = g_netdevices; dev; dev = dev->flink)
|
||||
{
|
||||
/* Is the interface in the "up" state? */
|
||||
@@ -100,7 +99,7 @@ static FAR struct net_driver_s *netdev_finddevice_ipv4addr(in_addr_t ripaddr)
|
||||
{
|
||||
/* Its a match */
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return dev;
|
||||
}
|
||||
}
|
||||
@@ -108,7 +107,7 @@ static FAR struct net_driver_s *netdev_finddevice_ipv4addr(in_addr_t ripaddr)
|
||||
|
||||
/* No device with the matching address found */
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return NULL;
|
||||
}
|
||||
#endif /* CONFIG_NET_IPv4 */
|
||||
@@ -137,11 +136,10 @@ static FAR struct net_driver_s *
|
||||
netdev_finddevice_ipv6addr(const net_ipv6addr_t ripaddr)
|
||||
{
|
||||
FAR struct net_driver_s *dev;
|
||||
net_lock_t save;
|
||||
|
||||
/* Examine each registered network device */
|
||||
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
for (dev = g_netdevices; dev; dev = dev->flink)
|
||||
{
|
||||
/* Is the interface in the "up" state? */
|
||||
@@ -155,7 +153,7 @@ netdev_finddevice_ipv6addr(const net_ipv6addr_t ripaddr)
|
||||
{
|
||||
/* Its a match */
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return dev;
|
||||
}
|
||||
}
|
||||
@@ -163,7 +161,7 @@ netdev_finddevice_ipv6addr(const net_ipv6addr_t ripaddr)
|
||||
|
||||
/* No device with the matching address found */
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return NULL;
|
||||
}
|
||||
#endif /* CONFIG_NET_IPv6 */
|
||||
|
||||
@@ -78,20 +78,19 @@ FAR struct net_driver_s *netdev_findbyindex(int index)
|
||||
{
|
||||
#ifdef CONFIG_NETDEV_MULTINIC
|
||||
FAR struct net_driver_s *dev;
|
||||
net_lock_t save;
|
||||
int i;
|
||||
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
for (i = 0, dev = g_netdevices; dev; i++, dev = dev->flink)
|
||||
{
|
||||
if (i == index)
|
||||
{
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return dev;
|
||||
}
|
||||
}
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return NULL;
|
||||
#else
|
||||
return (index == 0) ? g_netdevices : NULL;
|
||||
|
||||
@@ -73,21 +73,20 @@
|
||||
FAR struct net_driver_s *netdev_findbyname(FAR const char *ifname)
|
||||
{
|
||||
FAR struct net_driver_s *dev;
|
||||
net_lock_t save;
|
||||
|
||||
if (ifname)
|
||||
{
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
for (dev = g_netdevices; dev; dev = dev->flink)
|
||||
{
|
||||
if (strcmp(ifname, dev->d_ifname) == 0)
|
||||
{
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return dev;
|
||||
}
|
||||
}
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
||||
@@ -73,12 +73,11 @@
|
||||
int netdev_foreach(netdev_callback_t callback, FAR void *arg)
|
||||
{
|
||||
FAR struct net_driver_s *dev;
|
||||
net_lock_t save;
|
||||
int ret = 0;
|
||||
|
||||
if (callback)
|
||||
{
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
for (dev = g_netdevices; dev; dev = dev->flink)
|
||||
{
|
||||
if (callback(dev, arg) != 0)
|
||||
@@ -88,7 +87,7 @@ int netdev_foreach(netdev_callback_t callback, FAR void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
@@ -178,7 +178,6 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
|
||||
#ifdef CONFIG_NET_USER_DEVFMT
|
||||
FAR const char devfmt_str[IFNAMSIZ];
|
||||
#endif
|
||||
net_lock_t save;
|
||||
int devnum;
|
||||
|
||||
if (dev)
|
||||
@@ -271,7 +270,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
|
||||
* the interface
|
||||
*/
|
||||
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
|
||||
#ifdef CONFIG_NET_MULTILINK
|
||||
# ifdef CONFIG_NET_LOOPBACK
|
||||
@@ -316,7 +315,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
|
||||
#ifdef CONFIG_NET_IGMP
|
||||
igmp_devinit(dev);
|
||||
#endif
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
|
||||
#ifdef CONFIG_NET_ETHERNET
|
||||
ninfo("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
|
||||
|
||||
@@ -91,11 +91,10 @@ int netdev_unregister(FAR struct net_driver_s *dev)
|
||||
{
|
||||
struct net_driver_s *prev;
|
||||
struct net_driver_s *curr;
|
||||
net_lock_t save;
|
||||
|
||||
if (dev)
|
||||
{
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
|
||||
/* Find the device in the list of known network devices */
|
||||
|
||||
@@ -125,7 +124,7 @@ int netdev_unregister(FAR struct net_driver_s *dev)
|
||||
curr->flink = NULL;
|
||||
}
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
|
||||
#ifdef CONFIG_NET_ETHERNET
|
||||
ninfo("Unregistered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
|
||||
|
||||
@@ -64,12 +64,11 @@
|
||||
bool netdev_verify(FAR struct net_driver_s *dev)
|
||||
{
|
||||
FAR struct net_driver_s *chkdev;
|
||||
net_lock_t save;
|
||||
bool valid = false;
|
||||
|
||||
/* Search the list of registered devices */
|
||||
|
||||
save = net_lock();
|
||||
net_lock();
|
||||
for (chkdev = g_netdevices; chkdev != NULL; chkdev = chkdev->flink)
|
||||
{
|
||||
/* Is the the network device that we are looking for? */
|
||||
@@ -83,6 +82,6 @@ bool netdev_verify(FAR struct net_driver_s *dev)
|
||||
}
|
||||
}
|
||||
|
||||
net_unlock(save);
|
||||
net_unlock();
|
||||
return valid;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user