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

nrf24l01p_ng: make use of netdev_register()

Browse Source
This commit is contained in:
Fabian Hüßler 2020-12-01 13:44:29 +01:00
parent 063ff60890
commit 7d618afa17
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/include/nrf24l01p_ng.h
View File

@ -184,11 +184,14 @@ struct nrf24l01p_ng {
* *
* @param[in] dev NRF24L01+ device handle * @param[in] dev NRF24L01+ device handle
* @param[in] params Parameters of the device to setup * @param[in] params Parameters of the device to setup
* @param[in] index Index of @p params in a global parameter struct array.
* If initialized manually, pass a unique identifier instead.
* *
* @retval 0 Device successfully set up * @retval 0 Device successfully set up
*/ */
int nrf24l01p_ng_setup(nrf24l01p_ng_t *dev, int nrf24l01p_ng_setup(nrf24l01p_ng_t *dev,
const nrf24l01p_ng_params_t *params); const nrf24l01p_ng_params_t *params,
uint8_t index);
/** /**
* @brief Enable or disable data pipe @p pipe * @brief Enable or disable data pipe @p pipe

4
drivers/nrf24l01p_ng/nrf24l01p_ng.c
View File

@ -36,7 +36,8 @@
#define NRF24L01P_NG_REG_RX_PW_PX(x) (NRF24L01P_NG_REG_RX_PW_P0 + (x)) #define NRF24L01P_NG_REG_RX_PW_PX(x) (NRF24L01P_NG_REG_RX_PW_P0 + (x))
int nrf24l01p_ng_setup(nrf24l01p_ng_t *dev, int nrf24l01p_ng_setup(nrf24l01p_ng_t *dev,
const nrf24l01p_ng_params_t *params) const nrf24l01p_ng_params_t *params,
uint8_t index)
{ {
assert(dev); assert(dev);
assert(params); assert(params);
@ -46,6 +47,7 @@ int nrf24l01p_ng_setup(nrf24l01p_ng_t *dev,
dev->idle_state = NRF24L01P_NG_STATE_RX_MODE; dev->idle_state = NRF24L01P_NG_STATE_RX_MODE;
dev->params = *params; dev->params = *params;
dev->netdev.driver = &nrf24l01p_ng_driver; dev->netdev.driver = &nrf24l01p_ng_driver;
netdev_register(&dev->netdev, NETDEV_NRF24L01P_NG, index);
return 0; return 0;
} }

2
sys/net/gnrc/netif/init_devs/auto_init_nrf24l01p_ng.c
View File

@ -72,7 +72,7 @@ void auto_init_nrf24l01p_ng(void)
for (unsigned i = 0; i < NRF24L01P_NG_NUM; i++) { for (unsigned i = 0; i < NRF24L01P_NG_NUM; i++) {
LOG_DEBUG("[auto_init_netif] initializing nrf24l01p #%u\n", i); LOG_DEBUG("[auto_init_netif] initializing nrf24l01p #%u\n", i);
nrf24l01p_ng_setup(&_nrf24l01p_ng_devs[i], &nrf24l01p_ng_params[i]); nrf24l01p_ng_setup(&_nrf24l01p_ng_devs[i], &nrf24l01p_ng_params[i], i);
gnrc_netif_nrf24l01p_ng_create(&_netif[i], stacks[i], gnrc_netif_nrf24l01p_ng_create(&_netif[i], stacks[i],
NRF24L01P_NG_MAC_STACKSIZE, NRF24L01P_NG_MAC_STACKSIZE,
NRF24L01P_NG_MAC_PRIO, NRF24L01P_NG_MAC_PRIO,