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

Replace self defined macros with NET_SOCK_[FAMILY|TYPE|PROTOCOL]

Browse Source 
NET_SOCK_* is defined by nuttx/net/netconfig.h and then can be shared

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-12-20 01:08:35 +08:00 committed by Gustavo Henrique Nihei
parent cc1a1b5781
commit dfcb3cea59
2 changed files with 5 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/net/rpmsgdrv.c
View File

@ -46,74 +46,6 @@
* Pre-processor Definitions
****************************************************************************/
/* The address family that we used to create the socket really does not
* matter. It should, however, be valid in the current configuration.
*/
#if defined(CONFIG_NET_IPv4)
# define NET_RPMSG_DRV_FAMILY AF_INET
#elif defined(CONFIG_NET_IPv6)
# define NET_RPMSG_DRV_FAMILY AF_INET6
#elif defined(CONFIG_NET_IEEE802154)
# define NET_RPMSG_DRV_FAMILY AF_IEEE802154
#elif defined(CONFIG_WIRELESS_PKTRADIO)
# define NET_RPMSG_DRV_FAMILY AF_PKTRADIO
#elif defined(CONFIG_NET_USRSOCK)
# define NET_RPMSG_DRV_FAMILY AF_INET
#elif defined(CONFIG_NET_PKT)
# define NET_RPMSG_DRV_FAMILY AF_PACKET
#elif defined(CONFIG_NET_LOCAL)
# define NET_RPMSG_DRV_FAMILY AF_LOCAL
#else
# define NET_RPMSG_DRV_FAMILY AF_UNSPEC
#endif
/* SOCK_DGRAM is the preferred socket type to use when we just want a
* socket for performing driver ioctls. However, we can't use SOCK_DRAM
* if UDP is disabled.
*
* Pick a socket type (and perhaps protocol) compatible with the currently
* selected address family.
*/
#if NET_RPMSG_DRV_FAMILY == AF_INET
# if defined(CONFIG_NET_UDP)
# define NET_RPMSG_DRV_TYPE SOCK_DGRAM
# elif defined(CONFIG_NET_TCP)
# define NET_RPMSG_DRV_TYPE SOCK_STREAM
# elif defined(CONFIG_NET_ICMP_SOCKET)
# define NET_RPMSG_DRV_TYPE SOCK_DGRAM
# define NET_RPMSG_DRV_PROTOCOL IPPROTO_ICMP
# endif
#elif NET_RPMSG_DRV_FAMILY == AF_INET6
# if defined(CONFIG_NET_UDP)
# define NET_RPMSG_DRV_TYPE SOCK_DGRAM
# elif defined(CONFIG_NET_TCP)
# define NET_RPMSG_DRV_TYPE SOCK_STREAM
# elif defined(CONFIG_NET_ICMPv6_SOCKET)
# define NET_RPMSG_DRV_TYPE SOCK_DGRAM
# define NET_RPMSG_DRV_PROTOCOL IPPROTO_ICMP6
# endif
#elif NET_RPMSG_DRV_FAMILY == AF_IEEE802154
# define NET_RPMSG_DRV_TYPE SOCK_DGRAM
#elif NET_RPMSG_DRV_FAMILY == AF_PKTRADIO
# define NET_RPMSG_DRV_TYPE SOCK_DGRAM
#elif NET_RPMSG_DRV_FAMILY == AF_PACKET
# define NET_RPMSG_DRV_TYPE SOCK_RAW
#elif NET_RPMSG_DRV_FAMILY == AF_LOCAL
# if defined(CONFIG_NET_LOCAL_DGRAM)
# define NET_RPMSG_DRV_TYPE SOCK_DGRAM
# elif defined(CONFIG_NET_LOCAL_STREAM)
# define NET_RPMSG_DRV_TYPE SOCK_STREAM
# endif
#endif
/* Socket protocol of zero normally works */
#ifndef NET_RPMSG_DRV_PROTOCOL
# define NET_RPMSG_DRV_PROTOCOL 0
#endif
/* Work queue support is required. */
#if !defined(CONFIG_SCHED_WORKQUEUE)
@ -458,9 +390,9 @@ static int net_rpmsg_drv_sockioctl_task(int argc, FAR char *argv[])
FAR struct rpmsg_endpoint *ept;
struct socket sock;
int domain = NET_RPMSG_DRV_FAMILY;
int type = NET_RPMSG_DRV_TYPE;
int protocol = NET_RPMSG_DRV_PROTOCOL;
int domain = NET_SOCK_FAMILY;
int type = NET_SOCK_TYPE;
int protocol = NET_SOCK_PROTOCOL;
/* Restore pointers from argv */

15
net/netdev/netdev_ioctl.c
View File

@ -120,17 +120,6 @@
#endif
#endif /* CONFIG_NETDEV_IOCTL */
/* This is really kind of bogus.. When asked for an IP address, this is
* family that is returned in the ifr structure. Probably could just skip
* this since the address family has nothing to do with the Ethernet address.
*/
#ifdef CONFIG_NET_IPv6
# define AF_INETX AF_INET6
#else
# define AF_INETX AF_INET
#endif
/****************************************************************************
* Private Functions
****************************************************************************/
@ -932,7 +921,7 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
if (dev->d_lltype == NET_LL_ETHERNET ||
dev->d_lltype == NET_LL_IEEE80211)
{
req->ifr_hwaddr.sa_family = AF_INETX;
req->ifr_hwaddr.sa_family = NET_SOCK_FAMILY;
memcpy(req->ifr_hwaddr.sa_data,
dev->d_mac.ether.ether_addr_octet, IFHWADDRLEN);
ret = OK;
@ -944,7 +933,7 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
if (dev->d_lltype == NET_LL_IEEE802154 ||
dev->d_lltype == NET_LL_PKTRADIO)
{
req->ifr_hwaddr.sa_family = AF_INETX;
req->ifr_hwaddr.sa_family = NET_SOCK_FAMILY;
memcpy(req->ifr_hwaddr.sa_data,
dev->d_mac.radio.nv_addr,
dev->d_mac.radio.nv_addrlen);