From b43a1070a2f9062a8b8ef8f8af34c67eeaee2a18 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Sun, 21 Feb 2016 00:28:28 +0100 Subject: [PATCH 1/5] drivers: encx24j600: correctly pass on isr_arg --- drivers/encx24j600/encx24j600.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/encx24j600/encx24j600.c b/drivers/encx24j600/encx24j600.c index 890a1bb520..c76b62dece 100644 --- a/drivers/encx24j600/encx24j600.c +++ b/drivers/encx24j600/encx24j600.c @@ -101,7 +101,7 @@ static void encx24j600_isr(void *arg) gpio_irq_disable(dev->int_pin); /* call netdev2 hook */ - dev->netdev.event_callback((netdev2_t*) dev, NETDEV2_EVENT_ISR, NULL); + dev->netdev.event_callback((netdev2_t*) dev, NETDEV2_EVENT_ISR, dev->isr_arg); } static void _isr(netdev2_t *netdev) From d454e83009e01340061aaf9b1fac7d7e3c9bfff9 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Sun, 21 Feb 2016 00:29:58 +0100 Subject: [PATCH 2/5] drivers: ethos: correctly pass on isr_arg --- drivers/ethos/ethos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ethos/ethos.c b/drivers/ethos/ethos.c index 99f158c554..0e11166732 100644 --- a/drivers/ethos/ethos.c +++ b/drivers/ethos/ethos.c @@ -110,7 +110,7 @@ static void _end_of_frame(ethos_t *dev) case ETHOS_FRAME_TYPE_DATA: if (dev->framesize) { dev->last_framesize = dev->framesize; - dev->netdev.event_callback((netdev2_t*) dev, NETDEV2_EVENT_ISR, NULL); + dev->netdev.event_callback((netdev2_t*) dev, NETDEV2_EVENT_ISR, dev->netdev.isr_arg); } break; case ETHOS_FRAME_TYPE_HELLO: From 2e61f4d36559ac5f0997bf3e91ca95ed0f7a5efb Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Sun, 21 Feb 2016 21:49:42 +0100 Subject: [PATCH 3/5] drivers: enc28j60: correctly pass on isr_arg --- drivers/enc28j60/enc28j60.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/enc28j60/enc28j60.c b/drivers/enc28j60/enc28j60.c index b6d74c7431..d195f92cf1 100644 --- a/drivers/enc28j60/enc28j60.c +++ b/drivers/enc28j60/enc28j60.c @@ -215,7 +215,7 @@ static void mac_set(enc28j60_t *dev, uint8_t *mac) static void on_int(void *arg) { netdev2_t *netdev = (netdev2_t *)arg; - netdev->event_callback(arg, NETDEV2_EVENT_ISR, NULL); + netdev->event_callback(arg, NETDEV2_EVENT_ISR, netdev->isr_arg); } static int nd_send(netdev2_t *netdev, const struct iovec *data, int count) From 60122cca82669067512057cef3c5035ec00d86cd Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Sun, 21 Feb 2016 21:54:58 +0100 Subject: [PATCH 4/5] cpu: native: netdev2_tap: don't pass isr_arg on rx complete event --- cpu/native/netdev2_tap/netdev2_tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpu/native/netdev2_tap/netdev2_tap.c b/cpu/native/netdev2_tap/netdev2_tap.c index 3f98399b1f..5cccddafc7 100644 --- a/cpu/native/netdev2_tap/netdev2_tap.c +++ b/cpu/native/netdev2_tap/netdev2_tap.c @@ -101,7 +101,7 @@ static inline int _set_promiscous(netdev2_t *netdev, int value) static inline void _isr(netdev2_t *netdev) { if (netdev->event_callback) { - netdev->event_callback(netdev, NETDEV2_EVENT_RX_COMPLETE, netdev->isr_arg); + netdev->event_callback(netdev, NETDEV2_EVENT_RX_COMPLETE, NULL); } #if DEVELHELP else { From 5b4b40cc1e0dce99ea6e08e459c37c3b9e80e8cd Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Sun, 21 Feb 2016 22:01:03 +0100 Subject: [PATCH 5/5] drivers: cc110x: don't pass isr_arg on rx complete event --- drivers/cc110x/cc110x-netdev2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cc110x/cc110x-netdev2.c b/drivers/cc110x/cc110x-netdev2.c index 248a1da66a..ffb241efa1 100644 --- a/drivers/cc110x/cc110x-netdev2.c +++ b/drivers/cc110x/cc110x-netdev2.c @@ -178,7 +178,7 @@ static void _netdev2_cc110x_rx_callback(void *arg) netdev2_t *netdev2 = (netdev2_t*) arg; cc110x_t *cc110x = &((netdev2_cc110x_t*) arg)->cc110x; gpio_irq_disable(cc110x->params.gdo2); - netdev2->event_callback(netdev2, NETDEV2_EVENT_RX_COMPLETE, netdev2->isr_arg); + netdev2->event_callback(netdev2, NETDEV2_EVENT_RX_COMPLETE, NULL); } static void _isr(netdev2_t *dev)