sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/net: Remove HAVE_ATOMICS and use CONFIG_HAVE_ATOMICS directly

Browse Source 
since OpenAMP never support to compile in c89 only mode

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-07-02 09:24:09 +08:00 committed by Petro Karashchenko
parent 8f66b033db
commit 015e30a866
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/netdev_upperhalf.c
View File

@ -91,7 +91,7 @@ struct netdev_upperhalf_s
static int quota_fetch_inc(FAR struct netdev_lowerhalf_s *lower,
enum netpkt_type_e type)
{
#ifndef HAVE_ATOMICS
#ifndef CONFIG_HAVE_ATOMICS
irqstate_t flags = spin_lock_irqsave(&lower->lock);
int ret = lower->quota[type]++;
spin_unlock_irqrestore(&lower->lock, flags);
@ -104,7 +104,7 @@ static int quota_fetch_inc(FAR struct netdev_lowerhalf_s *lower,
static int quota_fetch_dec(FAR struct netdev_lowerhalf_s *lower,
enum netpkt_type_e type)
{
#ifndef HAVE_ATOMICS
#ifndef CONFIG_HAVE_ATOMICS
irqstate_t flags = spin_lock_irqsave(&lower->lock);
int ret = lower->quota[type]--;
spin_unlock_irqrestore(&lower->lock, flags);
@ -680,7 +680,7 @@ int netdev_lower_register(FAR struct netdev_lowerhalf_s *dev,
return -ENOMEM;
}
#ifndef HAVE_ATOMICS
#ifndef CONFIG_HAVE_ATOMICS
spin_initialize(&dev->lock, SP_UNLOCKED);
#endif
dev->netdev.d_ifup = netdev_upper_ifup;
@ -849,7 +849,7 @@ void netdev_lower_txdone(FAR struct netdev_lowerhalf_s *dev)
int netdev_lower_quota_load(FAR struct netdev_lowerhalf_s *dev,
enum netpkt_type_e type)
{
#ifndef HAVE_ATOMICS
#ifndef CONFIG_HAVE_ATOMICS
irqstate_t flags = spin_lock_irqsave(&dev->lock);
int ret = dev->quota[type];
spin_unlock_irqrestore(&dev->lock, flags);

14
include/nuttx/net/netdev_lowerhalf.h
View File

@ -34,13 +34,7 @@
#include <net/if.h>
#include <netinet/in.h>
/* Compiler may not have stdatomic.h before C11 or with __STDC_NO_ATOMICS__
* But we can also get atomic support from libmetal.
*/
#if defined(CONFIG_OPENAMP)
# include <metal/atomic.h>
#elif defined(CONFIG_HAVE_ATOMICS)
#ifdef CONFIG_HAVE_ATOMICS
# include <stdatomic.h>
#endif
@ -62,10 +56,6 @@
#define NETPKT_BUFLEN CONFIG_IOB_BUFSIZE
#if defined(CONFIG_OPENAMP) || defined(CONFIG_HAVE_ATOMICS)
# define HAVE_ATOMICS
#endif
/****************************************************************************
* Public Types
****************************************************************************/
@ -103,7 +93,7 @@ struct netdev_lowerhalf_s
/* Max # of buffer held by driver */
#ifdef HAVE_ATOMICS
#ifdef CONFIG_HAVE_ATOMICS
atomic_int quota[NETPKT_TYPENUM];
#else
int quota[NETPKT_TYPENUM];