From fab672c7bac0b735607f8251577db64b4ae61ba6 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Thu, 14 Jan 2010 23:32:05 +0000 Subject: [PATCH] Reverted the FIFOP->FIFO change; it didn't work :( --- core/dev/cc2420.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/dev/cc2420.c b/core/dev/cc2420.c index b272b2659..1e2749236 100644 --- a/core/dev/cc2420.c +++ b/core/dev/cc2420.c @@ -28,7 +28,7 @@ * * 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. @@ -629,7 +629,7 @@ cc2420_read(void *buf, unsigned short bufsize) struct timestamp t; #endif /* CC2420_CONF_TIMESTAMPS */ - if(!FIFO_IS_1) { + if(!FIFOP_IS_1) { /* If FIFO is 0, there is no packet in the RXFIFO. */ return 0; } @@ -718,7 +718,7 @@ cc2420_read(void *buf, unsigned short bufsize) if(FIFOP_IS_1 && !FIFO_IS_1) { /* printf("cc2420_read: FIFOP_IS_1 1\n");*/ flushrx(); - } else if(FIFO_IS_1) { + } else if(FIFOP_IS_1) { /* Another packet has been received and needs attention. */ process_poll(&cc2420_process); }