removed LPL debugging code

diff --git a/tos/chips/rf230/RF230LayerP.nc b/tos/chips/rf230/RF230LayerP.nc
index 9788d59aff36d081801f0de554aeeed4fb8afff5..b4283591d7e3cda47fa7079f021a9e9f4e90f998 100644 (file)
--- a/tos/chips/rf230/RF230LayerP.nc
+++ b/tos/chips/rf230/RF230LayerP.nc
@@ -312,7 +312,9 @@ implementation
                }
                else if( cmd == CMD_TURNON && state == STATE_TRX_OFF && isSpiAcquired() )
                {
+                       ASSERT( ! radioIRQ );
                        call IRQ.captureRisingEdge();
+
                        writeRegister(RF230_TRX_STATE, RF230_RX_ON);
                        state = STATE_TRX_OFF_2_RX_ON;
                }
@@ -320,6 +322,8 @@ implementation
                        && state == STATE_RX_ON && isSpiAcquired() )
                {
                        call IRQ.disable();
+                       radioIrq = FALSE;
+
                        writeRegister(RF230_TRX_STATE, RF230_FORCE_TRX_OFF);
                        state = STATE_TRX_OFF;
                }
@@ -658,22 +662,7 @@ implementation
                                        ASSERT( state == STATE_BUSY_TX_2_RX_ON );
                                }
                                else
-                               {
-#ifdef RF230_DEBUG
-//                                     ASSERT(FALSE);
-                                       if( call DiagMsg.record() )
-                                       {
-                                               call DiagMsg.str("assert pll");
-                                               call DiagMsg.uint16(call RadioAlarm.getNow());
-                                               call DiagMsg.hex8(readRegister(RF230_TRX_STATUS));
-                                               call DiagMsg.hex8(readRegister(RF230_TRX_STATE));
-                                               call DiagMsg.hex8(irq);
-                                               call DiagMsg.uint8(state);
-                                               call DiagMsg.uint8(cmd);
-                                               call DiagMsg.send();
-                                       }
-#endif
-                               }
+                                       ASSERT(FALSE);
                        }
 
                        if( irq & RF230_IRQ_RX_START )
@@ -757,22 +746,7 @@ implementation
                                        cmd = CMD_DOWNLOAD;
                                }
                                else
-                               {
-#ifdef RF230_DEBUG
-//                                     ASSERT(FALSE);
-                                       if( call DiagMsg.record() )
-                                       {
-                                               call DiagMsg.str("assert trx");
-                                               call DiagMsg.uint16(call RadioAlarm.getNow());
-                                               call DiagMsg.hex8(readRegister(RF230_TRX_STATUS));
-                                               call DiagMsg.hex8(readRegister(RF230_TRX_STATE));
-                                               call DiagMsg.hex8(irq);
-                                               call DiagMsg.uint8(state);
-                                               call DiagMsg.uint8(cmd);
-                                               call DiagMsg.send();
-                                       }
-#endif
-                               }
+                                       ASSERT(FALSE);
                        }
                }
        }

diff --git a/tos/chips/rf230/SoftwareAckLayerP.nc b/tos/chips/rf230/SoftwareAckLayerP.nc
index 51231b66db6a826684bea51425b2b702be8417fd..02ca70de1f69845a02b5ce62590184465c29a8ad 100644 (file)
--- a/tos/chips/rf230/SoftwareAckLayerP.nc
+++ b/tos/chips/rf230/SoftwareAckLayerP.nc
@@ -133,6 +133,8 @@ implementation
 
                if( state == STATE_ACK_WAIT )
                {
+                       ASSERT( !ack || call SoftwareAckConfig.verifyAckPacket(txMsg, msg) );
+
                        call RadioAlarm.cancel();
                        call SoftwareAckConfig.setAckReceived(txMsg, ack);