Merge pull request #611 from nfi/cc2x20-sfd-config
Corrected CC2x20 sfd config and startup message.
This commit is contained in:
commit
9ceb059c21
|
@ -59,7 +59,7 @@ void
|
||||||
cc2420_arch_sfd_init(void)
|
cc2420_arch_sfd_init(void)
|
||||||
{
|
{
|
||||||
/* Need to select the special function! */
|
/* 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 */
|
/* start timer B - 32768 ticks per second */
|
||||||
TBCTL = TBSSEL_1 | TBCLR;
|
TBCTL = TBSSEL_1 | TBCLR;
|
||||||
|
|
|
@ -58,7 +58,7 @@ void
|
||||||
cc2520_arch_sfd_init(void)
|
cc2520_arch_sfd_init(void)
|
||||||
{
|
{
|
||||||
/* Need to select the special function! */
|
/* 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 */
|
/* start timer B - 32768 ticks per second */
|
||||||
TBCTL = TBSSEL_1 | TBCLR;
|
TBCTL = TBSSEL_1 | TBCLR;
|
||||||
|
|
|
@ -338,7 +338,7 @@ main(int argc, char **argv)
|
||||||
NETSTACK_MAC.name, NETSTACK_RDC.name,
|
NETSTACK_MAC.name, NETSTACK_RDC.name,
|
||||||
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
|
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
|
||||||
NETSTACK_RDC.channel_check_interval()),
|
NETSTACK_RDC.channel_check_interval()),
|
||||||
CC2420_CONF_CCA_THRESH);
|
CC2420_CONF_CHANNEL);
|
||||||
#endif /* WITH_UIP6 */
|
#endif /* WITH_UIP6 */
|
||||||
|
|
||||||
#if !WITH_UIP && !WITH_UIP6
|
#if !WITH_UIP && !WITH_UIP6
|
||||||
|
|
Loading…
Reference in a new issue