giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cc2538 platforms: initialize linkaddr in phase 2 but set RF params only in phase 3

Browse Source
This commit is contained in:
Simon Duquennoy 2017-11-23 05:19:00 -08:00
parent c687b615ee
commit bc741c00cc
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/platform/cc2538dk/platform.c
View File

@ -103,9 +103,6 @@ set_rf_params(void)
short_addr = ext_addr[7]; short_addr = ext_addr[7];
short_addr |= ext_addr[6] << 8; short_addr |= ext_addr[6] << 8;
/* Populate linkaddr_node_addr. Maintain endianness */
memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
NETSTACK_RADIO.set_value(RADIO_PARAM_PAN_ID, IEEE802154_PANID); NETSTACK_RADIO.set_value(RADIO_PARAM_PAN_ID, IEEE802154_PANID);
NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr); NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr);
NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, CC2538_RF_CHANNEL); NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, CC2538_RF_CHANNEL);
@ -159,7 +156,8 @@ platform_init_stage_two()
crypto_disable(); crypto_disable();
#endif #endif
set_rf_params(); /* Populate linkaddr_node_addr */
ieee_addr_cpy_to(linkaddr_node_addr.u8, LINKADDR_SIZE);
INTERRUPTS_ENABLE(); INTERRUPTS_ENABLE();
@ -171,6 +169,8 @@ platform_init_stage_three()
{ {
LOG_INFO("%s\n", BOARD_STRING); LOG_INFO("%s\n", BOARD_STRING);
set_rf_params();
soc_print_info(); soc_print_info();
adc_init(); adc_init();

8
arch/platform/openmote-cc2538/platform.c
View File

@ -111,9 +111,6 @@ set_rf_params(void)
short_addr = ext_addr[7]; short_addr = ext_addr[7];
short_addr |= ext_addr[6] << 8; short_addr |= ext_addr[6] << 8;
/* Populate linkaddr_node_addr. Maintain endianness */
memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
NETSTACK_RADIO.set_value(RADIO_PARAM_PAN_ID, IEEE802154_PANID); NETSTACK_RADIO.set_value(RADIO_PARAM_PAN_ID, IEEE802154_PANID);
NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr); NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr);
NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, CC2538_RF_CHANNEL); NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, CC2538_RF_CHANNEL);
@ -157,7 +154,8 @@ platform_init_stage_two()
crypto_disable(); crypto_disable();
#endif #endif
set_rf_params(); /* Populate linkaddr_node_addr */
ieee_addr_cpy_to(linkaddr_node_addr.u8, LINKADDR_SIZE);
INTERRUPTS_ENABLE(); INTERRUPTS_ENABLE();
@ -169,6 +167,8 @@ platform_init_stage_three()
{ {
LOG_INFO("%s\n", BOARD_STRING); LOG_INFO("%s\n", BOARD_STRING);
set_rf_params();
board_init(); board_init();
soc_print_info(); soc_print_info();

8
arch/platform/zoul/platform.c
View File

@ -166,9 +166,6 @@ set_rf_params(void)
short_addr = ext_addr[7]; short_addr = ext_addr[7];
short_addr |= ext_addr[6] << 8; short_addr |= ext_addr[6] << 8;
/* Populate linkaddr_node_addr. Maintain endianness */
memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
NETSTACK_RADIO.set_value(RADIO_PARAM_PAN_ID, IEEE802154_PANID); NETSTACK_RADIO.set_value(RADIO_PARAM_PAN_ID, IEEE802154_PANID);
NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr); NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr);
NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, CC2538_RF_CHANNEL); NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, CC2538_RF_CHANNEL);
@ -220,7 +217,8 @@ platform_init_stage_two()
crypto_disable(); crypto_disable();
#endif #endif
set_rf_params(); /* Populate linkaddr_node_addr */
ieee_addr_cpy_to(linkaddr_node_addr.u8, LINKADDR_SIZE);
INTERRUPTS_ENABLE(); INTERRUPTS_ENABLE();
@ -232,6 +230,8 @@ platform_init_stage_three()
{ {
LOG_INFO("%s\n", BOARD_STRING); LOG_INFO("%s\n", BOARD_STRING);
set_rf_params();
board_init(); board_init();
rtc_init(); rtc_init();