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

Merge branch 'contiki' into osd

Browse source
This commit is contained in:
Harald Pichler 2014-12-29 08:20:00 +01:00
commit 9efc5d41c1
19 changed files with 63 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cpu/avr/dev/usb/rndis/rndis_task.h
View file

@ -56,7 +56,7 @@
//_____ M A C R O S ________________________________________________________
#define USB_ETH_MTU UIP_BUFSIZE+4
#define USB_ETH_MTU (UIP_BUFSIZE + 4)
/*! Hook Documentation

6
cpu/avr/radio/rf230bb/rf230bb.c
View file

@ -1679,7 +1679,7 @@ rf230_cca(void)
/* Use ED register to determine result. 77dBm is poweron csma default.*/
#ifdef RF230_CONF_CCA_THRES
if (hal_register_read(RG_PHY_ED_LEVEL)<(91+RF230_CONF_CCA_THRES) cca=0xff;
if (hal_register_read(RG_PHY_ED_LEVEL)<(91+RF230_CONF_CCA_THRES)) cca=0xff;
#else
if (hal_register_read(RG_PHY_ED_LEVEL)<(91-77)) cca=0xff;
#endif
@ -1701,9 +1701,9 @@ rf230_cca(void)
/* If already in receive mode can read the current ED register without delay */
/* CCA energy threshold = -91dB + 2*SR_CCA_ED_THRESH. Reset defaults to -77dB */
#ifdef RF230_CONF_CCA_THRES
if (hal_register_read(RG_PHY_ED_LEVEL)<(91+RF230_CONF_CCA_THRES) cca=0xff;
if (hal_register_read(RG_PHY_ED_LEVEL)<(91+RF230_CONF_CCA_THRES)) cca=0xff;
#else
if (hal_register_read(RG_PHY_ED_LEVEL)<(91-77)) cca=0xff;
if (hal_register_read(RG_PHY_ED_LEVEL)<(91-77)) cca=0xff;
#endif
#endif