Option to enable hardware acknowledgements based on CC2420_HW_ACKNOWLEDGEMENTS prepro...

[tinyos-2.x.git] / tos / chips / cc2420 / CC2420ReceiveP.nc

diff --git a/tos/chips/cc2420/CC2420ReceiveP.nc b/tos/chips/cc2420/CC2420ReceiveP.nc
index 96df09e7d59e52de13362221a2f88e4d462e1fe2..b024079ab7ea41472089361a546185a18b1caacc 100644 (file)
--- 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)) {