From e1870dc8614beb9cfdf8a072341cbf2dd1e77fa7 Mon Sep 17 00:00:00 2001 From: Jose Alamos Date: Thu, 30 Sep 2021 16:53:23 +0200 Subject: [PATCH] tests/driver_at86rf215: remove gnrc_netif_get_by_type dependency --- tests/driver_at86rf215/Makefile | 2 ++ tests/driver_at86rf215/main.c | 42 ++++++++++++--------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/tests/driver_at86rf215/Makefile b/tests/driver_at86rf215/Makefile index bdddfa34f0..b9ae2606aa 100644 --- a/tests/driver_at86rf215/Makefile +++ b/tests/driver_at86rf215/Makefile @@ -5,4 +5,6 @@ USEMODULE += at86rf215 USEMODULE += at86rf215_batmon USEMODULE += at86rf215_timestamp +CFLAGS += -DCONFIG_NETDEV_REGISTER_SIGNAL + include ../driver_netdev_common/Makefile.netdev.mk diff --git a/tests/driver_at86rf215/main.c b/tests/driver_at86rf215/main.c index 5366a0b6aa..4e8cc807a8 100644 --- a/tests/driver_at86rf215/main.c +++ b/tests/driver_at86rf215/main.c @@ -32,6 +32,18 @@ #include "od.h" static char batmon_stack[THREAD_STACKSIZE_MAIN]; +static at86rf215_t *dev; + +void netdev_register_signal(netdev_t *netdev, netdev_type_t type, uint8_t index) +{ + (void) index; + netdev_ieee802154_t *netdev_ieee802154 = container_of(netdev, + netdev_ieee802154_t, + netdev); + if (type == NETDEV_AT86RF215 && !dev) { + dev = container_of(netdev_ieee802154, at86rf215_t, netdev); + } +} void *batmon_thread(void *arg) { @@ -91,19 +103,11 @@ static int cmd_set_trim(int argc, char **argv) return 1; } - gnrc_netif_t *netif = gnrc_netif_get_by_type(NETDEV_AT86RF215, 0); - - if (netif == NULL) { + if (dev == NULL) { puts("No at86rf215 radio found"); return 1; } - netdev_t *netdev = netif->dev; - netdev_ieee802154_t *netdev_ieee802154 = container_of(netdev, - netdev_ieee802154_t, - netdev); - at86rf215_t* dev = container_of(netdev_ieee802154, at86rf215_t, netdev); - printf("setting trim to %u fF\n", 300U * trim); at86rf215_set_trim(dev, trim); @@ -147,19 +151,11 @@ static int cmd_set_clock_out(int argc, char **argv) freq = tmp; } - gnrc_netif_t *netif = gnrc_netif_get_by_type(NETDEV_AT86RF215, 0); - - if (netif == NULL) { + if (dev == NULL) { puts("No at86rf215 radio found"); return 1; } - netdev_t *netdev = netif->dev; - netdev_ieee802154_t *netdev_ieee802154 = container_of(netdev, - netdev_ieee802154_t, - netdev); - at86rf215_t* dev = container_of(netdev_ieee802154, at86rf215_t, netdev); - printf("Clock output set to %s %s\n", keys[freq], freq ? "MHz" : ""); at86rf215_set_clock_output(dev, AT86RF215_CLKO_4mA, freq); @@ -183,19 +179,11 @@ static int cmd_get_random(int argc, char **argv) return 1; } - gnrc_netif_t *netif = gnrc_netif_get_by_type(NETDEV_AT86RF215, 0); - - if (netif == NULL) { + if (dev == NULL) { puts("No at86rf215 radio found"); return 1; } - netdev_t *netdev = netif->dev; - netdev_ieee802154_t *netdev_ieee802154 = container_of(netdev, - netdev_ieee802154_t, - netdev); - at86rf215_t* dev = container_of(netdev_ieee802154, at86rf215_t, netdev); - at86rf215_get_random(dev, buffer, values); od_hex_dump(buffer, values, 0);