sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
examples/thttpd/thttpd_main.c
View File

@ -95,14 +95,25 @@
# error "You must not disable loadable modules via CONFIG_BINFMT_DISABLE in your configuration file"
#endif
/* Ethernet specific configuration */
#ifdef CONFIG_NET_ETHERNET
/* Otherwise, use the standard Ethernet device name */
# define NET_DEVNAME "eth0"
#else
/* No Ethernet -> No MAC address operations */
# undef CONFIG_EXAMPLES_THTTPD_NOMAC
#endif
/* SLIP-specific configuration */
#ifdef CONFIG_NET_SLIP
/* No MAC address operations */
# undef CONFIG_EXAMPLES_THTTPD_NOMAC
/* TTY device to use */
# ifndef CONFIG_NET_SLIPTTY
@ -110,12 +121,10 @@
# endif
# define SLIP_DEVNO 0
# define NET_DEVNAME "sl0"
#else
/* Otherwise, use the standard ethernet device name */
# define NET_DEVNAME "eth0"
# ifndef NET_DEVNAME
# define NET_DEVNAME "sl0"
# endif
#endif
/* Describe the ROMFS file system */

2
netutils/netlib/Makefile
View File

@ -52,7 +52,7 @@ endif
# No MAC address support for SLIP (Ethernet only)
ifneq ($(CONFIG_NET_SLIP),y)
ifeq ($(CONFIG_NET_ETHERNET),y)
CSRCS += netlib_setmacaddr.c netlib_getmacaddr.c
endif

6
nshlib/nsh_netcmds.c
View File

@ -589,7 +589,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
FAR char *gwip = NULL;
FAR char *mask = NULL;
FAR char *tmp = NULL;
#ifndef CONFIG_NET_SLIP
#ifdef CONFIG_NET_ETHERNET
FAR char *hw = NULL;
#endif
#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
@ -661,7 +661,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
}
}
#ifndef CONFIG_NET_SLIP
#ifdef CONFIG_NET_ETHERNET
/* REVISIT: How will we handle Ethernet and SLIP networks together? */
else if (!strcmp(tmp, "hw"))
@ -703,7 +703,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
return ERROR;
}
#ifndef CONFIG_NET_SLIP
#ifdef CONFIG_NET_ETHERNET
/* Set Hardware Ethernet MAC address */
/* REVISIT: How will we handle Ethernet and SLIP networks together? */

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. */