apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-21 06:11:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Network: Various fixes for clean compile with both Ethernet and SLIP

Browse Source
This commit is contained in:
Gregory Nutt
2014-11-15 13:52:39 -06:00
parent 34bb359447
commit f9074a02ad
4 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nshlib/nsh_netinit.c
View File

@@ -92,13 +92,23 @@
* mixed transports.
*/
#ifdef CONFIG_NET_SLIP
#ifdef CONFIG_NET_MULILINK
# warning REVISIT: CONFIG_NET_MULILINK multilink support incomplete
#endif
/* If both SLIP and Ethernet interfaces are present, only the Ethernet
* interface will be initialized.
*/
#if defined(CONFIG_NET_ETHERNET)
# define NET_DEVNAME "eth0"
#elif defined(CONFIG_NET_SLIP)
# define NET_DEVNAME "sl0"
# ifndef CONFIG_NSH_NOMAC
# error "CONFIG_NSH_NOMAC must be defined for SLIP"
# endif
#else
# define NET_DEVNAME "eth0"
# error ERROR: No link layer protocol defined
#endif
/* While the network is up, the network monitor really does nothing. It
@@ -143,7 +153,8 @@ static void nsh_netinit_configure(void)
#if defined(CONFIG_NSH_DHCPC)
FAR void *handle;
#endif
#if (defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_NOMAC)) && !defined(CONFIG_NET_SLIP)
#if (defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_NOMAC)) && \
defined(CONFIG_NET_ETHERNET)
uint8_t mac[IFHWADDRLEN];
#endif
@@ -151,7 +162,7 @@ static void nsh_netinit_configure(void)
/* Many embedded network interfaces must have a software assigned MAC */
#if defined(CONFIG_NSH_NOMAC) && !defined(CONFIG_NET_SLIP)
#if defined(CONFIG_NSH_NOMAC) && defined(CONFIG_NET_ETHERNET)
#ifdef CONFIG_NSH_ARCHMAC
/* Let platform-specific logic assign the MAC address. */