From 7af516a6186288e8f60eedb3406a465fd52697d9 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Wed, 21 Nov 2018 14:15:37 +0100 Subject: [PATCH 1/3] netdev: add funcs for declaring get/set as notsup This commit adds two convenience functions that allow to declare get() and/or set() as not supported when declaring a netdev_driver struct. --- drivers/include/net/netdev.h | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/include/net/netdev.h b/drivers/include/net/netdev.h index f27e6c791f..3bbf429510 100644 --- a/drivers/include/net/netdev.h +++ b/drivers/include/net/netdev.h @@ -195,6 +195,7 @@ extern "C" { #endif #include +#include #include "iolist.h" #include "net/netopt.h" @@ -413,6 +414,47 @@ typedef struct netdev_driver { const void *value, size_t value_len); } netdev_driver_t; +/** + * @brief Convenience function for declaring get() as not supported in general + * + * @param[in] dev ignored + * @param[in] opt ignored + * @param[in] value ignored + * @param[in] max_len ignored + * + * @return always returns `-ENOTSUP` + */ +static inline int netdev_get_notsup(netdev_t *dev, netopt_t opt, + void *value, size_t max_len) +{ + (void)dev; + (void)opt; + (void)value; + (void)max_len; + return -ENOTSUP; +} + +/** + * @brief Convenience function for declaring set() as not supported in general + * + * @param[in] dev ignored + * @param[in] opt ignored + * @param[in] value ignored + * @param[in] value_len ignored + * + * @return always returns `-ENOTSUP` + */ +static inline int netdev_set_notsup(netdev_t *dev, netopt_t opt, + const void *value, size_t value_len) +{ + (void)dev; + (void)opt; + (void)value; + (void)value_len; + return -ENOTSUP; +} + + #ifdef __cplusplus } #endif From a07e71418e775d553950af20f36651de4ac10bb2 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Wed, 21 Nov 2018 14:24:12 +0100 Subject: [PATCH 2/3] drivers/slipdev: use netdev_set_notsup() --- drivers/slipdev/slipdev.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/slipdev/slipdev.c b/drivers/slipdev/slipdev.c index 9d0a15ac3e..430c26b241 100644 --- a/drivers/slipdev/slipdev.c +++ b/drivers/slipdev/slipdev.c @@ -188,23 +188,13 @@ static int _get(netdev_t *netdev, netopt_t opt, void *value, size_t max_len) } } -static int _set(netdev_t *netdev, netopt_t opt, const void *value, - size_t value_len) -{ - (void)netdev; - (void)opt; - (void)value; - (void)value_len; - return -ENOTSUP; -} - static const netdev_driver_t slip_driver = { .send = _send, .recv = _recv, .init = _init, .isr = _isr, .get = _get, - .set = _set, + .set = netdev_set_notsup, }; void slipdev_setup(slipdev_t *dev, const slipdev_params_t *params) From 755113d9212b150861bc76cddb8319381b810009 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Wed, 21 Nov 2018 14:24:41 +0100 Subject: [PATCH 3/3] pkg/softdevice: use netdev_set_notsup() --- .../src/gnrc_nordic_ble_6lowpan.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkg/nordic_softdevice_ble/src/gnrc_nordic_ble_6lowpan.c b/pkg/nordic_softdevice_ble/src/gnrc_nordic_ble_6lowpan.c index 312a6135b4..760bbdd343 100644 --- a/pkg/nordic_softdevice_ble/src/gnrc_nordic_ble_6lowpan.c +++ b/pkg/nordic_softdevice_ble/src/gnrc_nordic_ble_6lowpan.c @@ -230,16 +230,6 @@ static int _netdev_get(netdev_t *netdev, netopt_t opt, return res; } -static int _netdev_set(netdev_t *netdev, netopt_t opt, - const void *value, size_t value_len) -{ - (void)netdev; - (void)opt; - (void)value; - (void)value_len; - return -ENOTSUP; -} - static int _netif_send(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt) { (void)netif; @@ -282,7 +272,7 @@ static const netdev_driver_t _ble_netdev_driver = { .init = _netdev_init, .isr = NULL, .get = _netdev_get, - .set = _netdev_set, + .set = netdev_set_notsup, }; static netdev_t _ble_dummy_dev = {