Merge pull request #3592 from authmillenon/native/api/mv-dev-eth-tap

native: rename ng_nativenet to dev_eth_tap

boards/native/Makefile.dep

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

cpu/native/Makefile

@@ -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

cpu/native/ng_net/Makefile → cpu/native/dev_eth_tap/Makefile

-MODULE = ng_nativenet
+MODULE = dev_eth_tap
 
 include $(RIOTBASE)/Makefile.base
 

cpu/native/include/dev_eth_tap.h

@@ -7,13 +7,14 @@
  */
 
 /**
- * @defgroup    net_dev_eth_impl Low-level Ethernet driver implementations
- * @ingroup     net_dev_eth_ll
+ * @defgroup    dev_eth_tap     Ethernet driver for TAP interfaces
+ * @ingroup     native_cpu
  * @brief       Low-level ethernet driver for native tap interfaces
  * @{
  *
  * @file
- * @brief       Definitions for low-level ethernet driver for native tap interfaces
+ * @brief       Definitions for @ref net_dev_eth driver for host system's
+ *              TAP interfaces
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */

cpu/native/native_cpu.c

@@ -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
 

cpu/native/startup.c

@@ -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
 

sys/auto_init/dev_eth/dev_eth_autoinit.c

@@ -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

sys/include/dev_eth_autoinit.h

@@ -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

sys/include/net/dev_eth.h

@@ -8,11 +8,9 @@
  */
 
 /**
- * @defgroup    net_dev_eth_ll Low-Level Driver Inteface
+ * @defgroup    net_dev_eth Low-Level Driver Interface
  * @ingroup     net_ethernet
- * @file
  * @brief       Low-level ethernet driver interface
- * @{
  *
  * This interface is supposed to be a low-level interface for ethernet drivers.
  * In order to be universally usable, it leaves out many implementation details
@@ -44,6 +42,8 @@
  *
  * Check out the dev_eth test application as example.
  *
+ * @{
+ *
  * @file
  * @brief       Definitions low-level ethernet driver interface
  *

tests/dev_eth/Makefile

@@ -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

tests/driver_netdev_eth/Makefile

@@ -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