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

netlib: add AF_CAN family and CONFIG_NET_CAN support

Browse Source
This commit is contained in:
Peter van der Perk 2020-06-15 10:52:34 +02:00 committed by patacongo
parent faba0249c1
commit 839b3530d4
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/netutils/netlib.h
View File

@ -98,6 +98,8 @@
# define NETLIB_SOCK_FAMILY AF_LOCAL # define NETLIB_SOCK_FAMILY AF_LOCAL
#elif defined(CONFIG_NET_PKT) #elif defined(CONFIG_NET_PKT)
# define NETLIB_SOCK_FAMILY AF_PACKET # define NETLIB_SOCK_FAMILY AF_PACKET
#elif defined(CONFIG_NET_CAN)
# define NETLIB_SOCK_FAMILY AF_CAN
#elif defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_IEEE802154)
# define NETLIB_SOCK_FAMILY AF_IEEE802154 # define NETLIB_SOCK_FAMILY AF_IEEE802154
#elif defined(CONFIG_WIRELESS_PKTRADIO) #elif defined(CONFIG_WIRELESS_PKTRADIO)
@ -152,6 +154,8 @@
# endif # endif
#elif NETLIB_SOCK_FAMILY == AF_PACKET #elif NETLIB_SOCK_FAMILY == AF_PACKET
# define NETLIB_SOCK_TYPE SOCK_RAW # define NETLIB_SOCK_TYPE SOCK_RAW
#elif NETLIB_SOCK_FAMILY == AF_CAN
# define NETLIB_SOCK_TYPE SOCK_RAW
#elif NETLIB_SOCK_FAMILY == AF_IEEE802154 #elif NETLIB_SOCK_FAMILY == AF_IEEE802154
# define NETLIB_SOCK_TYPE SOCK_DGRAM # define NETLIB_SOCK_TYPE SOCK_DGRAM
#elif NETLIB_SOCK_FAMILY == AF_BLUETOOTH #elif NETLIB_SOCK_FAMILY == AF_BLUETOOTH

12
netutils/netinit/netinit.c
View File

@ -100,6 +100,7 @@
# undef CONFIG_NET_LOCAL # undef CONFIG_NET_LOCAL
# undef CONFIG_NET_USRSOCK # undef CONFIG_NET_USRSOCK
# undef CONFIG_NET_IEEE802154 # undef CONFIG_NET_IEEE802154
# undef CONFIG_NET_CAN
# undef CONFIG_NET_LOOPBACK # undef CONFIG_NET_LOOPBACK
#elif defined(CONFIG_NET_6LOWPAN) #elif defined(CONFIG_NET_6LOWPAN)
# undef CONFIG_NET_SLIP # undef CONFIG_NET_SLIP
@ -107,26 +108,34 @@
# undef CONFIG_NET_LOCAL # undef CONFIG_NET_LOCAL
# undef CONFIG_NET_USRSOCK # undef CONFIG_NET_USRSOCK
# undef CONFIG_NET_IEEE802154 # undef CONFIG_NET_IEEE802154
# undef CONFIG_NET_CAN
# undef CONFIG_NET_LOOPBACK # undef CONFIG_NET_LOOPBACK
#elif defined(CONFIG_NET_SLIP) #elif defined(CONFIG_NET_SLIP)
# undef CONFIG_NET_TUN # undef CONFIG_NET_TUN
# undef CONFIG_NET_LOCAL # undef CONFIG_NET_LOCAL
# undef CONFIG_NET_USRSOCK # undef CONFIG_NET_USRSOCK
# undef CONFIG_NET_IEEE802154 # undef CONFIG_NET_IEEE802154
# undef CONFIG_NET_CAN
# undef CONFIG_NET_LOOPBACK # undef CONFIG_NET_LOOPBACK
#elif defined(CONFIG_NET_TUN) #elif defined(CONFIG_NET_TUN)
# undef CONFIG_NET_LOCAL # undef CONFIG_NET_LOCAL
# undef CONFIG_NET_USRSOCK # undef CONFIG_NET_USRSOCK
# undef CONFIG_NET_IEEE802154 # undef CONFIG_NET_IEEE802154
# undef CONFIG_NET_CAN
# undef CONFIG_NET_LOOPBACK # undef CONFIG_NET_LOOPBACK
#elif defined(CONFIG_NET_LOCAL) #elif defined(CONFIG_NET_LOCAL)
# undef CONFIG_NET_USRSOCK # undef CONFIG_NET_USRSOCK
# undef CONFIG_NET_IEEE802154 # undef CONFIG_NET_IEEE802154
# undef CONFIG_NET_CAN
# undef CONFIG_NET_LOOPBACK # undef CONFIG_NET_LOOPBACK
#elif defined(CONFIG_NET_USRSOCK) #elif defined(CONFIG_NET_USRSOCK)
# undef CONFIG_NET_IEEE802154 # undef CONFIG_NET_IEEE802154
# undef CONFIG_NET_CAN
# undef CONFIG_NET_LOOPBACK # undef CONFIG_NET_LOOPBACK
#elif defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_IEEE802154)
# undef CONFIG_NET_CAN
# undef CONFIG_NET_LOOPBACK
#elif defined(CONFIG_NET_CAN)
# undef CONFIG_NET_LOOPBACK # undef CONFIG_NET_LOOPBACK
#endif #endif
@ -189,6 +198,9 @@
#elif defined(CONFIG_NET_LOCAL) #elif defined(CONFIG_NET_LOCAL)
# define NET_DEVNAME "lo" # define NET_DEVNAME "lo"
# define NETINIT_HAVE_NETDEV # define NETINIT_HAVE_NETDEV
#elif defined(CONFIG_NET_CAN)
# define NET_DEVNAME "can0"
# define NETINIT_HAVE_NETDEV
#endif #endif
/* If we have no network device (perhaps only USRSOCK, local loopback, or /* If we have no network device (perhaps only USRSOCK, local loopback, or