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

Merge remote branch 'libmc1322x/master'

Browse source
This commit is contained in:
Mariano Alvira 2011-02-18 12:38:30 -05:00
commit 07f77b02eb
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cpu/mc1322x/lib/maca.c
View file

@ -150,7 +150,7 @@ void check_maca(void) {
#if DEBUG_MACA
if((count = count_packets()) != NUM_PACKETS) {
PRINTF("check maca: count_packets %d\n", count);
PRINTF("check maca: count_packets %d\n", (int)count);
Print_Packets("check_maca");
#if PACKET_STATS
for(i=0; i<NUM_PACKETS; i++) {
@ -615,6 +615,7 @@ void maca_isr(void) {
*MACA_CLRIRQ = (1 << maca_irq_di);
dma_rx->length = *MACA_GETRXLVL - 2; /* packet length does not include FCS */
dma_rx->lqi = get_lqi();
dma_rx->rx_time = *MACA_TIMESTAMP;
/* check if received packet needs an ack */
if(dma_rx->data[1] & 0x20) {