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

Reverted the FIFOP->FIFO change; it didn't work :(

Browse source
This commit is contained in:
adamdunkels 2010-01-14 23:32:05 +00:00
parent 467df8ad4c
commit fab672c7ba
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/dev/cc2420.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: cc2420.c,v 1.36 2009/12/11 18:32:54 zhitao Exp $ * @(#)$Id: cc2420.c,v 1.37 2010/01/14 23:32:05 adamdunkels Exp $
*/ */
/* /*
* This code is almost device independent and should be easy to port. * This code is almost device independent and should be easy to port.
@ -629,7 +629,7 @@ cc2420_read(void *buf, unsigned short bufsize)
struct timestamp t; struct timestamp t;
#endif /* CC2420_CONF_TIMESTAMPS */ #endif /* CC2420_CONF_TIMESTAMPS */
if(!FIFO_IS_1) { if(!FIFOP_IS_1) {
/* If FIFO is 0, there is no packet in the RXFIFO. */ /* If FIFO is 0, there is no packet in the RXFIFO. */
return 0; return 0;
} }
@ -718,7 +718,7 @@ cc2420_read(void *buf, unsigned short bufsize)
if(FIFOP_IS_1 && !FIFO_IS_1) { if(FIFOP_IS_1 && !FIFO_IS_1) {
/* printf("cc2420_read: FIFOP_IS_1 1\n");*/ /* printf("cc2420_read: FIFOP_IS_1 1\n");*/
flushrx(); flushrx();
} else if(FIFO_IS_1) { } else if(FIFOP_IS_1) {
/* Another packet has been received and needs attention. */ /* Another packet has been received and needs attention. */
process_poll(&cc2420_process); process_poll(&cc2420_process);
} }