From 3ad195963d999f1d380f1745a7dd1d3f9a0e6267 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 22 Feb 2016 00:02:45 +0100
Subject: [PATCH] drivers: netdev2: rename isr_arg
---
drivers/include/net/netdev2.h | 5 ++++-
sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/include/net/netdev2.h b/drivers/include/net/netdev2.h
index bede2b6d59..37bf8dcd7a 100644
--- a/drivers/include/net/netdev2.h
+++ b/drivers/include/net/netdev2.h
@@ -101,11 +101,14 @@ typedef void (*netdev2_event_cb_t)(netdev2_t *dev, netdev2_event_t event);
*
* Supposed to be extended by driver implementations.
* The extended structure should contain all variable driver state.
+ *
+ * Contains a field @p context which is not used by the drivers, but supposed to
+ * be used by upper layers to store reference information.
*/
struct netdev2 {
const struct netdev2_driver *driver; /**< ptr to that driver's interface. */
netdev2_event_cb_t event_callback; /**< callback for device events */
- void *isr_arg; /**< argument to pass on isr event */
+ void* context; /**< ptr to network stack context */
#ifdef MODULE_NETSTATS_L2
netstats_t stats; /**< transceiver's statistics */
#endif
diff --git a/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c b/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c
index adcc23ad55..b28d6e772e 100644
--- a/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c
+++ b/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c
@@ -48,7 +48,7 @@ static void _pass_on_packet(gnrc_pktsnip_t *pkt);
*/
static void _event_cb(netdev2_t *dev, netdev2_event_t event)
{
- gnrc_netdev2_t *gnrc_netdev2 = (gnrc_netdev2_t*) dev->isr_arg;
+ gnrc_netdev2_t *gnrc_netdev2 = (gnrc_netdev2_t*) dev->context;
if (event == NETDEV2_EVENT_ISR) {
msg_t msg;
@@ -122,7 +122,7 @@ static void *_gnrc_netdev2_thread(void *args)
/* register the event callback with the device driver */
dev->event_callback = _event_cb;
- dev->isr_arg = (void*) gnrc_netdev2;
+ dev->context = (void*) gnrc_netdev2;
/* register the device to the network stack*/
gnrc_netif_add(thread_getpid());
--
GitLab