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

cc2538_rf: Remove PAN ID initialization from reset

Browse Source
This commit is contained in:
Koen Zandberg 2018-11-13 21:10:03 +01:00
parent 167858077f
commit da0866a6a0
No known key found for this signature in database
GPG Key ID: 0895A893E6D2985B
3 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/cc2538/include/cc2538_rf.h
View File

@ -57,7 +57,6 @@ extern "C" {
#define CC2538_RF_POWER_DEFAULT (IEEE802154_DEFAULT_TXPOWER) /**< Default output power in dBm */ #define CC2538_RF_POWER_DEFAULT (IEEE802154_DEFAULT_TXPOWER) /**< Default output power in dBm */
#define CC2538_RF_CHANNEL_DEFAULT (IEEE802154_DEFAULT_CHANNEL) #define CC2538_RF_CHANNEL_DEFAULT (IEEE802154_DEFAULT_CHANNEL)
#define CC2538_RF_PANID_DEFAULT (IEEE802154_DEFAULT_PANID)
#define OUTPUT_POWER_MIN (-24) /**< Min output power in dBm */ #define OUTPUT_POWER_MIN (-24) /**< Min output power in dBm */
#define OUTPUT_POWER_MAX (7) /**< Max output power in dBm */ #define OUTPUT_POWER_MAX (7) /**< Max output power in dBm */

1
cpu/cc2538/radio/cc2538_rf.c
View File

@ -88,7 +88,6 @@ void cc2538_init(void)
cc2538_set_tx_power(CC2538_RF_POWER_DEFAULT); cc2538_set_tx_power(CC2538_RF_POWER_DEFAULT);
cc2538_set_chan(CC2538_RF_CHANNEL_DEFAULT); cc2538_set_chan(CC2538_RF_CHANNEL_DEFAULT);
cc2538_set_pan(CC2538_RF_PANID_DEFAULT);
cc2538_set_addr_long(cc2538_get_eui64_primary()); cc2538_set_addr_long(cc2538_get_eui64_primary());
/* Select the observable signals (maximum of three) */ /* Select the observable signals (maximum of three) */

3
cpu/cc2538/radio/cc2538_rf_netdev.c
View File

@ -353,7 +353,6 @@ static int _init(netdev_t *netdev)
cc2538_rf_t *dev = (cc2538_rf_t *) netdev; cc2538_rf_t *dev = (cc2538_rf_t *) netdev;
_dev = netdev; _dev = netdev;
uint16_t pan = cc2538_get_pan();
uint16_t chan = cc2538_get_chan(); uint16_t chan = cc2538_get_chan();
uint16_t addr_short = cc2538_get_addr_short(); uint16_t addr_short = cc2538_get_addr_short();
uint64_t addr_long = cc2538_get_addr_long(); uint64_t addr_long = cc2538_get_addr_long();
@ -361,8 +360,6 @@ static int _init(netdev_t *netdev)
netdev_ieee802154_reset(&dev->netdev); netdev_ieee802154_reset(&dev->netdev);
/* Initialise netdev_ieee802154_t struct */ /* Initialise netdev_ieee802154_t struct */
netdev_ieee802154_set(&dev->netdev, NETOPT_NID,
&pan, sizeof(pan));
netdev_ieee802154_set(&dev->netdev, NETOPT_CHANNEL, netdev_ieee802154_set(&dev->netdev, NETOPT_CHANNEL,
&chan, sizeof(chan)); &chan, sizeof(chan));
netdev_ieee802154_set(&dev->netdev, NETOPT_ADDRESS, netdev_ieee802154_set(&dev->netdev, NETOPT_ADDRESS,