RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

native: rename ng_nativenet to dev_eth_tap

Browse Source
This commit is contained in:
Martine Lenders 2015-08-09 22:03:08 +02:00
parent ca71ae4f59
commit f0cb1429f0
10 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/native/Makefile.dep
View File

@ -1,5 +1,5 @@
ifneq (,$(filter ng_netif_default,$(USEMODULE)))
USEMODULE += ng_nativenet
USEMODULE += dev_eth_tap
USEMODULE += ng_netdev_eth
USEMODULE += ng_nomac
endif

4
cpu/native/Makefile
View File

@ -2,8 +2,8 @@ MODULE = cpu
DIRS += periph
ifneq (,$(filter ng_nativenet,$(USEMODULE)))
DIRS += ng_net
ifneq (,$(filter dev_eth_tap,$(USEMODULE)))
DIRS += dev_eth_tap
endif
include $(RIOTBASE)/Makefile.base

2
cpu/native/ng_net/Makefile → cpu/native/dev_eth_tap/Makefile
View File

@ -1,4 +1,4 @@
MODULE = ng_nativenet
MODULE = dev_eth_tap
include $(RIOTBASE)/Makefile.base

0
cpu/native/ng_net/dev_eth_tap.c → cpu/native/dev_eth_tap/dev_eth_tap.c
View File

4
cpu/native/native_cpu.c
View File

@ -49,7 +49,7 @@
#include "cpu.h"
#include "cpu_conf.h"
#ifdef MODULE_NG_NATIVENET
#ifdef MODULE_DEV_ETH_TAP
#include "dev_eth_tap.h"
extern dev_eth_tap_t dev_eth_tap;
#endif
@ -75,7 +75,7 @@ int reboot_arch(int mode)
/* TODO: close stdio fds */
#endif
#ifdef MODULE_NG_NATIVENET
#ifdef MODULE_DEV_ETH_TAP
dev_eth_tap_cleanup(&dev_eth_tap);
#endif

8
cpu/native/startup.c
View File

@ -46,7 +46,7 @@ unsigned _native_rng_seed = 0;
int _native_rng_mode = 0;
const char *_native_unix_socket_path = NULL;
#ifdef MODULE_NG_NATIVENET
#ifdef MODULE_DEV_ETH_TAP
#include "dev_eth_tap.h"
extern dev_eth_tap_t dev_eth_tap;
#endif
@ -196,7 +196,7 @@ void usage_exit(void)
{
real_printf("usage: %s", _progname);
#if defined(MODULE_NG_NATIVENET)
#if defined(MODULE_DEV_ETH_TAP)
real_printf(" <tap interface>");
#endif
@ -256,7 +256,7 @@ __attribute__((constructor)) static void startup(int argc, char **argv)
int replay = 0;
#endif
#if defined(MODULE_NG_NATIVENET)
#if defined(MODULE_DEV_ETH_TAP)
if (
(argc < 2)
|| (
@ -367,7 +367,7 @@ __attribute__((constructor)) static void startup(int argc, char **argv)
native_cpu_init();
native_interrupt_init();
#ifdef MODULE_NG_NATIVENET
#ifdef MODULE_DEV_ETH_TAP
dev_eth_tap_setup(&dev_eth_tap, argv[1]);
#endif

4
sys/auto_init/dev_eth/dev_eth_autoinit.c
View File

@ -9,7 +9,7 @@
#include "net/dev_eth.h"
#include "dev_eth_autoinit.h"
#ifdef MODULE_NG_NATIVENET
#ifdef MODULE_DEV_ETH_TAP
#include "dev_eth_tap.h"
#endif
@ -19,7 +19,7 @@ encx24j600_t dev_eth_encx24j600;
#endif
dev_eth_t * const dev_eth_devices[] = {
#ifdef MODULE_NG_NATIVENET
#ifdef MODULE_DEV_ETH_TAP
[DEV_ETH_TAP] = (dev_eth_t*)&dev_eth_tap,
#endif
#ifdef MODULE_ENCX24J600

2
sys/include/dev_eth_autoinit.h
View File

@ -29,7 +29,7 @@ extern "C" {
* @brief enum for available ethernet devices
*/
enum {
#ifdef MODULE_NG_NATIVENET
#ifdef MODULE_DEV_ETH_TAP
DEV_ETH_TAP,
#endif
#ifdef MODULE_ENCX24J600

2
tests/dev_eth/Makefile
View File

@ -5,7 +5,7 @@ BOARD_WHITELIST = native
FEATURES_REQUIRED += ethernet
ifneq (,$(filter native,$(BOARD)))
USEMODULE += ng_nativenet
USEMODULE += dev_eth_tap
endif
USEMODULE += dev_eth_autoinit

2
tests/driver_netdev_eth/Makefile
View File

@ -3,7 +3,7 @@ include ../Makefile.tests_common
BOARD_WHITELIST := native
USEMODULE += ng_nativenet
USEMODULE += dev_eth_tap
USEMODULE += ng_netbase
USEMODULE += ng_nomac
USEMODULE += ng_pktdump