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

arch/sim: Change CONFIG_NET_ETHERNET to CONFIG_SIM_NETDEV

Browse Source
This commit is contained in:
Xiang Xiao 2020-02-10 15:27:36 +08:00 committed by Gregory Nutt
parent 6b1187b402
commit 5a00657ac4
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sim/Kconfig
View File

@ -113,7 +113,7 @@ config SIM_WALLTIME
config SIM_NETDEV
bool "Simulated Network Device"
default y
depends on NET
depends on NET_ETHERNET
select ARCH_HAVE_NETDEV_STATISTICS
select SCHED_LPWORK
---help---

2
arch/sim/src/Makefile
View File

@ -164,7 +164,6 @@ ifeq ($(CONFIG_ARCH_ROMGETC),y)
endif
ifeq ($(CONFIG_SIM_NETDEV),y)
ifeq ($(CONFIG_NET_ETHERNET),y)
CSRCS += up_netdriver.c
HOSTCFLAGS += -DNETDEV_BUFSIZE=$(CONFIG_NET_ETH_PKTSIZE)
ifneq ($(HOSTOS),Cygwin)
@ -180,7 +179,6 @@ else # HOSTOS != Cygwin
HOSTSRCS += up_wpcap.c up_netdev.c
DRVLIB = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a
endif # HOSTOS != Cygwin
endif # CONFIG_NET_ETHERNET
endif # CONFIG_SIM_NETDEV
ifeq ($(CONFIG_RPTUN),y)

2
arch/sim/src/sim/up_idle.c
View File

@ -96,7 +96,7 @@ void up_idle(void)
up_x11events();
#endif
#if defined(CONFIG_NET_ETHERNET) && defined(CONFIG_SIM_NETDEV)
#ifdef CONFIG_SIM_NETDEV
/* Run the network if enabled */
netdriver_loop();

2
arch/sim/src/sim/up_initialize.c
View File

@ -270,7 +270,7 @@ void up_initialize(void)
up_registerblockdevice(); /* Our FAT ramdisk at /dev/ram0 */
#endif
#if defined(CONFIG_NET_ETHERNET) && defined(CONFIG_SIM_NETDEV)
#ifdef CONFIG_SIM_NETDEV
netdriver_init(); /* Our "real" network driver */
#endif

6
arch/sim/src/sim/up_internal.h
View File

@ -322,7 +322,7 @@ FAR struct ioexpander_dev_s *sim_ioexpander_initialize(void);
/* up_tapdev.c **************************************************************/
#if defined(CONFIG_NET_ETHERNET) && !defined(__CYGWIN__)
#if defined(CONFIG_SIM_NETDEV) && !defined(__CYGWIN__)
void tapdev_init(void);
unsigned int tapdev_read(unsigned char *buf, unsigned int buflen);
void tapdev_send(unsigned char *buf, unsigned int buflen);
@ -338,7 +338,7 @@ void tapdev_ifdown(void);
/* up_wpcap.c ***************************************************************/
#if defined(CONFIG_NET_ETHERNET) && defined(__CYGWIN__)
#if defined(CONFIG_SIM_NETDEV) && defined(__CYGWIN__)
void wpcap_init(void);
unsigned int wpcap_read(unsigned char *buf, unsigned int buflen);
void wpcap_send(unsigned char *buf, unsigned int buflen);
@ -352,7 +352,7 @@ void wpcap_send(unsigned char *buf, unsigned int buflen);
/* up_netdriver.c ***********************************************************/
#ifdef CONFIG_NET_ETHERNET
#ifdef CONFIG_SIM_NETDEV
int netdriver_init(void);
void netdriver_setmacaddr(unsigned char *macaddr);
void netdriver_loop(void);