Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x

Browse Source
This commit is contained in:
Mariano Alvira 2011-05-06 12:13:41 -04:00
commit 1f99a4cdd6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/maca.c
View File

@ -618,7 +618,7 @@ void maca_isr(void) {
dma_rx->rx_time = *MACA_TIMESTAMP;
/* check if received packet needs an ack */
if(dma_rx->data[1] & 0x20) {
if(prm_mode == AUTOACK && (dma_rx->data[1] & 0x20)) {
/* this wait is necessary to auto-ack */
volatile uint32_t wait_clk;
wait_clk = *MACA_CLK + 200;
@ -1037,14 +1037,14 @@ const uint8_t VCODivI[16] = {
0x2f,
0x2f,
0x2f,
0x30,
0x30,
0x30,
0x2f,
0x30,
0x30,
0x30,
0x30,
0x30,
0x30,
0x30,
};
const uint32_t VCODivF[16] = {