deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #611 from nfi/cc2x20-sfd-config

Browse source 
Corrected CC2x20 sfd config and startup message.
This commit is contained in:
Adam Dunkels 2014-06-11 23:17:05 +02:00
parent f13184383c b13b5fc9ac
commit 9ceb059c21
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/msp430/cc2420-arch-sfd.c
View file

@ -59,7 +59,7 @@ void
cc2420_arch_sfd_init(void)
{
/* Need to select the special function! */
P4SEL = BV(CC2420_SFD_PIN);
CC2420_SFD_PORT(SEL) = BV(CC2420_SFD_PIN);
/* start timer B - 32768 ticks per second */
TBCTL = TBSSEL_1 | TBCLR;

2
cpu/msp430/cc2520-arch-sfd.c
View file

@ -58,7 +58,7 @@ void
cc2520_arch_sfd_init(void)
{
/* Need to select the special function! */
P4SEL = BV(CC2520_SFD_PIN);
CC2520_SFD_PORT(SEL) = BV(CC2520_SFD_PIN);
/* start timer B - 32768 ticks per second */
TBCTL = TBSSEL_1 | TBCLR;

2
platform/sky/contiki-sky-main.c
View file

@ -338,7 +338,7 @@ main(int argc, char **argv)
NETSTACK_MAC.name, NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
CC2420_CONF_CCA_THRESH);
CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
#if !WITH_UIP && !WITH_UIP6