X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fcc2420%2FCC2420ReceiveP.nc;h=b024079ab7ea41472089361a546185a18b1caacc;hb=24d50eb2fad1920f1322c86247b42433af30b348;hp=96df09e7d59e52de13362221a2f88e4d462e1fe2;hpb=c475ae95adff4b3da3bfb5b1b5fffd332fde7aee;p=tinyos-2.x.git

diff --git a/tos/chips/cc2420/CC2420ReceiveP.nc b/tos/chips/cc2420/CC2420ReceiveP.nc
index 96df09e7..b024079a 100644
--- a/tos/chips/cc2420/CC2420ReceiveP.nc
+++ b/tos/chips/cc2420/CC2420ReceiveP.nc
@@ -233,8 +233,8 @@ implementation {
     case S_RX_PAYLOAD:
       call CSN.set();
       
-#ifndef CC2420_NO_ACKNOWLEDGEMENTS
-      // Sorry about the preprocessing stuff. BaseStation depends on it.
+#if !defined(CC2420_NO_ACKNOWLEDGEMENTS) && !defined(CC2420_HW_ACKNOWLEDGEMENTS)
+      // Sorry about the preprocessing stuff. BaseStation and hw acks depends on it.
       if (((( header->fcf >> IEEE154_FCF_ACK_REQ ) & 0x01) == 1) 
           && (header->dest == call amAddress())
           && ((( header->fcf >> IEEE154_FCF_FRAME_TYPE ) & 7) == IEEE154_TYPE_DATA)) {