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

apps/netutils/netlib: Various fixes needed to get a clean netlib build with Bluetooth only.

Browse Source
This commit is contained in:
Gregory Nutt 2018-04-03 10:01:55 -06:00
parent c1ec9ab9a6
commit 0094b411da
8 changed files with 31 additions and 5 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_IEEE802154 # define NETLIB_SOCK_FAMILY AF_IEEE802154
#elif defined(CONFIG_WIRELESS_PKTRADIO) #elif defined(CONFIG_WIRELESS_PKTRADIO)
# define NETLIB_SOCK_FAMILY AF_PKTRADIO # define NETLIB_SOCK_FAMILY AF_PKTRADIO
#elif defined(CONFIG_NET_BLUETOOTH)
# define NETLIB_SOCK_FAMILY AF_BLUETOOTH
#elif defined(CONFIG_NET_USRSOCK) #elif defined(CONFIG_NET_USRSOCK)
# define NETLIB_SOCK_FAMILY AF_INET # define NETLIB_SOCK_FAMILY AF_INET
#else #else
@ -146,6 +148,8 @@
# define NETLIB_SOCK_TYPE SOCK_RAW # 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
# define NETLIB_SOCK_TYPE SOCK_RAW
#endif #endif
/**************************************************************************** /****************************************************************************

5
netutils/netlib/netlib_getessid.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* netutils/netlib/netlib_getessid.c * netutils/netlib/netlib_getessid.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -73,6 +73,9 @@
#elif defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_IEEE802154)
# define PF_FAMILY PF_IEEE802154 # define PF_FAMILY PF_IEEE802154
# define AF_FAMILY AF_IEEE802154 # define AF_FAMILY AF_IEEE802154
#elif defined(CONFIG_NET_BLUETOOTH)
# define PF_FAMILY PF_BLUETOOTH
# define AF_FAMILY AF_BLUETOOTH
#endif #endif
/**************************************************************************** /****************************************************************************

5
netutils/netlib/netlib_getifstatus.c
View File

@ -1,7 +1,8 @@
/**************************************************************************** /****************************************************************************
* netutils/netlib/netlib_getifstatus.c * netutils/netlib/netlib_getifstatus.c
* *
* Copyright (C) 2007-2009, 2011, 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2011, 2014, 2018 Gregory Nutt. All rights
* reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -71,6 +72,8 @@
# define AF_FAMILY AF_PACKET # define AF_FAMILY AF_PACKET
#elif defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_IEEE802154)
# define AF_FAMILY AF_IEEE802154 # define AF_FAMILY AF_IEEE802154
#elif defined(CONFIG_NET_BLUETOOTH)
# define AF_FAMILY AF_BLUETOOTH
#elif defined(CONFIG_NET_USRSOCK) #elif defined(CONFIG_NET_USRSOCK)
# define AF_FAMILY AF_INET # define AF_FAMILY AF_INET
#endif #endif

5
netutils/netlib/netlib_getmacaddr.c
View File

@ -1,7 +1,8 @@
/**************************************************************************** /****************************************************************************
* netutils/netlib/netlib_getmacaddr.c * netutils/netlib/netlib_getmacaddr.c
* *
* Copyright (C) 2007-2009, 2011, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2011, 2017-2018 Gregory Nutt. All rights
* reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -68,6 +69,8 @@
# define AF_FAMILY AF_PACKET # define AF_FAMILY AF_PACKET
#elif defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_IEEE802154)
# define AF_FAMILY AF_IEEE802154 # define AF_FAMILY AF_IEEE802154
#elif defined(CONFIG_NET_BLUETOOTH)
# define AF_FAMILY AF_BLUETOOTH
#elif defined(CONFIG_NET_USRSOCK) #elif defined(CONFIG_NET_USRSOCK)
# define AF_FAMILY AF_INET # define AF_FAMILY AF_INET
#endif #endif

3
netutils/netlib/netlib_setessid.c
View File

@ -73,6 +73,9 @@
#elif defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_IEEE802154)
# define PF_FAMILY PF_IEEE802154 # define PF_FAMILY PF_IEEE802154
# define AF_FAMILY AF_IEEE802154 # define AF_FAMILY AF_IEEE802154
#elif defined(CONFIG_NET_BLUETOOTH)
# define PF_FAMILY PF_BLUETOOTH
# define AF_FAMILY AF_BLUETOOTH
#endif #endif
/**************************************************************************** /****************************************************************************

5
netutils/netlib/netlib_setifstatus.c
View File

@ -1,7 +1,8 @@
/**************************************************************************** /****************************************************************************
* netutils/netlib/netlib_setifstatus.c * netutils/netlib/netlib_setifstatus.c
* *
* Copyright (C) 2007-2009, 2011, 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2011, 2014, 2018 Gregory Nutt. All rights
* reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -70,6 +71,8 @@
# define AF_FAMILY AF_PACKET # define AF_FAMILY AF_PACKET
#elif defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_IEEE802154)
# define AF_FAMILY AF_IEEE802154 # define AF_FAMILY AF_IEEE802154
#elif defined(CONFIG_NET_BLUETOOTH)
# define AF_FAMILY AF_BLUETOOTH
#elif defined(CONFIG_NET_USRSOCK) #elif defined(CONFIG_NET_USRSOCK)
# define AF_FAMILY AF_INET # define AF_FAMILY AF_INET
#endif #endif

6
netutils/netlib/netlib_setmacaddr.c
View File

@ -1,7 +1,8 @@
/**************************************************************************** /****************************************************************************
* netutils/netlib/netlib_setmacaddr.c * netutils/netlib/netlib_setmacaddr.c
* *
* Copyright (C) 2007-2009, 2011-2012, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2011-2012, 2017-2018 Gregory Nutt. All rights
* reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -73,6 +74,9 @@
#elif defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_IEEE802154)
# define PF_FAMILY PF_IEEE802154 # define PF_FAMILY PF_IEEE802154
# define AF_FAMILY AF_IEEE802154 # define AF_FAMILY AF_IEEE802154
#elif defined(CONFIG_NET_BLUETOOTH)
# define PF_FAMILY PF_BLUETOOTH
# define AF_FAMILY AF_BLUETOOTH
#elif defined(CONFIG_NET_USRSOCK) #elif defined(CONFIG_NET_USRSOCK)
# define PF_FAMILY PF_INET # define PF_FAMILY PF_INET
# define AF_FAMILY AF_INET # define AF_FAMILY AF_INET

3
nshlib/nsh_netinit.c
View File

@ -189,6 +189,9 @@
#elif defined(CONFIG_NET_6LOWPAN) || defined(CONFIG_NET_IEEE802154) #elif defined(CONFIG_NET_6LOWPAN) || defined(CONFIG_NET_IEEE802154)
# define NET_DEVNAME "wpan0" # define NET_DEVNAME "wpan0"
# define NSH_HAVE_NETDEV # define NSH_HAVE_NETDEV
#elif defined(CONFIG_NET_BLUETOOTH)
# define NET_DEVNAME "bnep0"
# define NSH_HAVE_NETDEV
#elif defined(CONFIG_NET_SLIP) #elif defined(CONFIG_NET_SLIP)
# define NET_DEVNAME "sl0" # define NET_DEVNAME "sl0"
# ifndef CONFIG_NSH_NOMAC # ifndef CONFIG_NSH_NOMAC