RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

netdev_ieee802154_submac: fix initialization code

Browse Source
This commit is contained in:
Jose Alamos 2021-06-07 13:36:13 +02:00
parent 4bd77183a3
commit 6b1241c7bf
No known key found for this signature in database
GPG Key ID: F483EB800EF89DD9
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/netdev_ieee802154_submac/netdev_ieee802154_submac.c
View File

@ -302,8 +302,24 @@ static int _init(netdev_t *netdev)
netdev_ieee802154_submac_t,
dev);
ieee802154_submac_t *submac = &netdev_submac->submac;
netdev_ieee802154_setup(netdev_ieee802154);
ieee802154_submac_init(submac, (network_uint16_t*) netdev_ieee802154->short_addr, (eui64_t*) netdev_ieee802154->long_addr);
/* This function already sets the PAN ID to the default one */
netdev_ieee802154_reset(netdev_ieee802154);
uint16_t chan = submac->channel_num;
int16_t tx_power = submac->tx_pow;
netopt_enable_t enable = NETOPT_ENABLE;
/* Initialise netdev_ieee802154_t struct */
netdev_ieee802154_set(netdev_ieee802154, NETOPT_CHANNEL,
&chan, sizeof(chan));
netdev_ieee802154_set(netdev_ieee802154, NETOPT_ACK_REQ,
&enable, sizeof(enable));
netdev_submac->dev.txpower = tx_power;
return 0;
}
@ -325,25 +341,6 @@ int netdev_ieee802154_submac_init(netdev_ieee802154_submac_t *netdev_submac,
netdev_submac->ack_timer.callback = _ack_timeout;
netdev_submac->ack_timer.arg = netdev_submac;
netdev_ieee802154_t *netdev_ieee802154 = &netdev_submac->dev;
/* This function already sets the PAN ID to the default one */
netdev_ieee802154_reset(netdev_ieee802154);
uint16_t chan = CONFIG_IEEE802154_DEFAULT_CHANNEL;
int16_t tx_power = CONFIG_IEEE802154_DEFAULT_TXPOWER;
netopt_enable_t enable = NETOPT_ENABLE;
netdev_ieee802154_setup(netdev_ieee802154);
/* Initialise netdev_ieee802154_t struct */
netdev_ieee802154_set(netdev_ieee802154, NETOPT_CHANNEL,
&chan, sizeof(chan));
netdev_ieee802154_set(netdev_ieee802154, NETOPT_ACK_REQ,
&enable, sizeof(enable));
netdev_submac->dev.txpower = tx_power;
return 0;
}