riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/gnrc: remove deprecated nomac

Browse Source
This commit is contained in:
Hauke Petersen 2017-02-14 16:11:17 +01:00
parent a52ce0aa1d
commit 05c4e314c9
6 changed files with 4 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/auto_init/netif/auto_init_slip.c
View File

@ -22,7 +22,6 @@
#include "log.h"
#include "board.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/nomac.h"
#include "net/gnrc.h"
#include "net/gnrc/slip.h"

8
sys/include/net/gnrc.h
View File

@ -18,10 +18,10 @@
* =====
*
* This module is currently the default network stack for RIOT and includes
* many components ranging from a @ref net_gnrc_nomac "simple MAC protocol"
* through a fully-featured @ref net_gnrc_ipv6 implementation with @ref
* net_gnrc_sixlowpan "6LowPAN" extensions to an @ref net_gnrc_udp "UDP"
* implementation and @ref net_gnrc_rpl.
* many components ranging from a @ref net_gnrc_netdev2 through a fully-featured
* @ref net_gnrc_ipv6 implementation with @ref net_gnrc_sixlowpan "6LowPAN"
* extensions to an @ref net_gnrc_udp "UDP" implementation and
* @ref net_gnrc_rpl.
*
* A list of all features contained in the @ref net_gnrc is available in the
* `Modules` section above.

62
sys/include/net/gnrc/nomac.h
View File

@ -1,62 +0,0 @@
/*
* Copyright (C) 2015 Freie Universität Berlin
*
* 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_nomac Simplest possible MAC layer
* @ingroup net_gnrc
* @brief Simplest possible MAC protocol that sends without considering
* the state of the medium
* @{
*
* @file
* @brief Interface definition for the NOMAC MAC layer
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/
#ifndef GNRC_NOMAC_H
#define GNRC_NOMAC_H
#include "net/gnrc/netdev.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Set the default message queue size for NOMAC layers
*/
#ifndef GNRC_NOMAC_MSG_QUEUE_SIZE
#define GNRC_NOMAC_MSG_QUEUE_SIZE (8U)
#endif
/**
* @brief Initialize an instance of the NOMAC layer
*
* The initialization starts a new thread that connects to the given netdev
* device and starts a link layer event loop.
*
* @param[in] stack stack for the control thread
* @param[in] stacksize size of *stack*
* @param[in] priority priority for the thread housing the NOMAC instance
* @param[in] name name of the thread housing the NOMAC instance
* @param[in] dev netdev device, needs to be already initialized
*
* @return PID of NOMAC thread on success
* @return -EINVAL if creation of thread fails
* @return -ENODEV if *dev* is invalid
*/
kernel_pid_t gnrc_nomac_init(char *stack, int stacksize, char priority,
const char *name, gnrc_netdev_t *dev);
#ifdef __cplusplus
}
#endif
#endif /* __NOMAC_H */
/** @} */

3
sys/net/gnrc/Makefile
View File

@ -67,9 +67,6 @@ endif
ifneq (,$(filter gnrc_nettest,$(USEMODULE)))
DIRS += nettest
endif
ifneq (,$(filter gnrc_nomac,$(USEMODULE)))
DIRS += link_layer/nomac
endif
ifneq (,$(filter gnrc_mac,$(USEMODULE)))
DIRS += link_layer/gnrc_mac
endif

3
sys/net/gnrc/link_layer/nomac/Makefile
View File

@ -1,3 +0,0 @@
MODULE = gnrc_nomac
include $(RIOTBASE)/Makefile.base

146
sys/net/gnrc/link_layer/nomac/gnrc_nomac.c
View File

@ -1,146 +0,0 @@
/*
* Copyright (C) 2015 Freie Universität Berlin
*
* 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.
*/
/**
* @{
* @ingroup net_nomac
* @file
* @brief Implementation of the NOMAC MAC protocol
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @}
*/
#include <errno.h>
#include "msg.h"
#include "thread.h"
#include "net/gnrc/nomac.h"
#include "net/gnrc.h"
#define ENABLE_DEBUG (0)
#include "debug.h"
#if ENABLE_DEBUG
/* For PRIu16 etc. */
#include <inttypes.h>
#endif
/**
* @brief Function called by the device driver on device events
*
* @param[in] event type of event
* @param[in] data optional parameter
*/
static void _event_cb(gnrc_netdev_event_t event, void *data)
{
DEBUG("nomac: event triggered -> %i\n", event);
/* NOMAC only understands the RX_COMPLETE event... */
if (event == NETDEV_EVENT_RX_COMPLETE) {
gnrc_pktsnip_t *pkt;
/* get pointer to the received packet */
pkt = (gnrc_pktsnip_t *)data;
/* send the packet to everyone interested in it's type */
if (!gnrc_netapi_dispatch_receive(pkt->type, GNRC_NETREG_DEMUX_CTX_ALL, pkt)) {
DEBUG("nomac: unable to forward packet of type %i\n", pkt->type);
gnrc_pktbuf_release(pkt);
}
}
}
/**
* @brief Startup code and event loop of the NOMAC layer
*
* @param[in] args expects a pointer to the underlying netdev device
*
* @return never returns
*/
static void *_nomac_thread(void *args)
{
gnrc_netdev_t *dev = (gnrc_netdev_t *)args;
gnrc_netapi_opt_t *opt;
int res;
msg_t msg, reply, msg_queue[GNRC_NOMAC_MSG_QUEUE_SIZE];
/* setup the MAC layers message queue */
msg_init_queue(msg_queue, GNRC_NOMAC_MSG_QUEUE_SIZE);
/* save the PID to the device descriptor and register the device */
dev->mac_pid = thread_getpid();
gnrc_netif_add(dev->mac_pid);
/* register the event callback with the device driver */
dev->driver->add_event_callback(dev, _event_cb);
/* start the event loop */
while (1) {
DEBUG("nomac: waiting for incoming messages\n");
msg_receive(&msg);
/* dispatch NETDEV and NETAPI messages */
switch (msg.type) {
case GNRC_NETDEV_MSG_TYPE_EVENT:
DEBUG("nomac: GNRC_NETDEV_MSG_TYPE_EVENT received\n");
dev->driver->isr_event(dev, msg.content.value);
break;
case GNRC_NETAPI_MSG_TYPE_SND:
DEBUG("nomac: GNRC_NETAPI_MSG_TYPE_SND received\n");
dev->driver->send_data(dev, msg.content.ptr);
break;
case GNRC_NETAPI_MSG_TYPE_SET:
/* TODO: filter out MAC layer options -> for now forward
everything to the device driver */
DEBUG("nomac: GNRC_NETAPI_MSG_TYPE_SET received\n");
/* read incoming options */
opt = msg.content.ptr;
/* set option for device driver */
res = dev->driver->set(dev, opt->opt, opt->data, opt->data_len);
DEBUG("nomac: response of netdev->set: %i\n", res);
/* send reply to calling thread */
reply.type = GNRC_NETAPI_MSG_TYPE_ACK;
reply.content.value = (uint32_t)res;
msg_reply(&msg, &reply);
break;
case GNRC_NETAPI_MSG_TYPE_GET:
/* TODO: filter out MAC layer options -> for now forward
everything to the device driver */
DEBUG("nomac: GNRC_NETAPI_MSG_TYPE_GET received\n");
/* read incoming options */
opt = msg.content.ptr;
/* get option from device driver */
res = dev->driver->get(dev, opt->opt, opt->data, opt->data_len);
DEBUG("nomac: response of netdev->get: %i\n", res);
/* send reply to calling thread */
reply.type = GNRC_NETAPI_MSG_TYPE_ACK;
reply.content.value = (uint32_t)res;
msg_reply(&msg, &reply);
break;
default:
DEBUG("nomac: Unknown command %" PRIu16 "\n", msg.type);
break;
}
}
/* never reached */
return NULL;
}
kernel_pid_t gnrc_nomac_init(char *stack, int stacksize, char priority,
const char *name, gnrc_netdev_t *dev)
{
kernel_pid_t res;
/* check if given netdev device is defined and the driver is set */
if (dev == NULL || dev->driver == NULL) {
return -ENODEV;
}
/* create new NOMAC thread */
res = thread_create(stack, stacksize, priority, THREAD_CREATE_STACKTEST,
_nomac_thread, (void *)dev, name);
if (res <= 0) {
return -EINVAL;
}
return res;
}