kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00
Code Releases Activity

Merge pull request #4991 from OlegHahm/gnrc_netdev_cleanup

Browse Source 
gnrc_netdev: cleanup
This commit is contained in:
Martine Lenders 2016-03-09 19:30:41 +01:00
commit 71b6221b57
3 changed files with 3 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.dep
View File

@ -31,6 +31,9 @@ endif
ifneq (,$(filter netdev2_tap,$(USEMODULE)))
USEMODULE += netif
USEMODULE += netdev2_eth
ifneq (,$(filter gnrc_%,$(USEMODULE)))
USEMODULE += gnrc_netdev2
endif
endif
ifneq (,$(filter gnrc_zep,$(USEMODULE)))
@ -364,10 +367,6 @@ ifneq (,$(filter cpp11-compat,$(USEMODULE)))
FEATURES_REQUIRED += cpp
endif
ifneq (,$(filter gnrc_netdev_eth,$(USEMODULE)))
USEMODULE += gnrc_pktbuf
endif
ifneq (,$(filter gnrc,$(USEMODULE)))
USEMODULE += gnrc_netapi
USEMODULE += gnrc_netreg

82
sys/include/net/gnrc/netdev_eth.h
View File

@ -1,82 +0,0 @@
/*
* Copyright (C) 2015 Martine Lenders <mlenders@inf.fu-berlin.de>
* Kaspar Schleiser <kaspar@schleiser.de>
* Ell-i open source co-operative
*
* This file is subject to the terms and conditions of the GNU Lesser General
* Public License v2.1. See the file LICENSE in the top level directory for
* more details.
*/
/**
* @defgroup net_gnrc_netdev_eth dev_eth as netdev device.
* @ingroup net_gnrc_netdev
*
* @brief Allows for usage of @p dev_eth as ethernet netdev devices.
*
* @{
*
* @file
* @brief Definitions for @ref gnrc_netdev_eth
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
* @author Kaspar Schleiser <kaspar@schleiser.de>
*/
#ifndef GNRC_NETDEV_ETH_H_
#define GNRC_NETDEV_ETH_H_
#include <inttypes.h>
#include "kernel_types.h"
#include "net/gnrc/netdev.h"
#include "net/ethernet/hdr.h"
#include "net/dev_eth.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Definition of the netdev_eth device
* @extends gnrc_netdev_t
* @internal
*/
typedef struct {
gnrc_netdev_driver_t *driver; /**< pointer to the devices interface */
gnrc_netdev_event_cb_t event_cb;/**< netdev event callback */
kernel_pid_t mac_pid; /**< the driver's thread's PID */
dev_eth_t *ethdev; /**< ptr to low-level device handle */
} gnrc_netdev_eth_t;
/**
* @brief Reference to the netdev_eth driver interface
*/
extern const gnrc_netdev_driver_t gnrc_netdev_eth_driver;
/**
* @brief Reference to the netdev_eth device
*/
extern gnrc_netdev_eth_t gnrc_netdev_eth;
/* XXX: this is only here since I do not know how to get the device in the
* interrupt handler */
/**
* @brief Initialize a given netdev_eth device
*
* @param[out] netdev netdev_eth device to initialize
* @param[in] ethdev handle dev_eth interface to be used
*
* Will initialize ethdev.
*
* @return 0 on success
* @return -ENODEV on invalid device descriptor
*/
int gnrc_netdev_eth_init(gnrc_netdev_eth_t *netdev, dev_eth_t *ethdev);
#ifdef __cplusplus
}
#endif
/** @} */
#endif /* GNRC_NETDEV_ETH_H_ */

3
sys/net/gnrc/Makefile
View File

@ -55,9 +55,6 @@ endif
ifneq (,$(filter gnrc_netapi,$(USEMODULE)))
DIRS += netapi
endif
ifneq (,$(filter gnrc_netdev_eth,$(USEMODULE)))
DIRS += link_layer/netdev_eth
endif
ifneq (,$(filter gnrc_netif,$(USEMODULE)))
DIRS += netif
endif