Code cleanup

diff --git a/tos/lib/tossim/CpmModelC.nc b/tos/lib/tossim/CpmModelC.nc
index a1d500449bb9361a1765596f3195b33b8b6dcc55..4fcce0b7846ad205027d8e131261fa11e0006547 100644 (file)
--- a/tos/lib/tossim/CpmModelC.nc
+++ b/tos/lib/tossim/CpmModelC.nc
@@ -51,7 +51,7 @@ implementation {
   bool requestAck;
   bool receiving = 0;  // Whether or not I think I'm receiving a packet
   bool transmitting = 0; // Whether or not I think I'm tranmitting a packet
-  sim_time_t TransmissionEndTime; // to check pending transmission
+  sim_time_t transmissionEndTime; // to check pending transmission
   struct receive_message;
   typedef struct receive_message receive_message_t;
 
@@ -394,8 +394,8 @@ implementation {
       dbg("CpmModelC,SNRLoss", "Lost packet from %i due to %i being mid-reception\n", source, sim_node());
       rcv->lost = 1;
     }
-    else if (transmitting && (rcv->start < TransmissionEndTime) && (TransmissionEndTime <= rcv->end)) {
-      dbg("CpmModelC,SNRLoss", "Lost packet from %i due to %i being mid-transmission, TransmissionEndTime %llu\n", source, sim_node(), TransmissionEndTime);
+    else if (transmitting && (rcv->start < transmissionEndTime) && (transmissionEndTime <= rcv->end)) {
+      dbg("CpmModelC,SNRLoss", "Lost packet from %i due to %i being mid-transmission, transmissionEndTime %llu\n", source, sim_node(), transmissionEndTime);
       rcv->lost = 1;
     }
     else {
@@ -431,7 +431,7 @@ implementation {
     gain_entry_t* neighborEntry = sim_gain_first(sim_node());
     requestAck = ack;
     outgoing = msg;
-    TransmissionEndTime = endTime;
+    transmissionEndTime = endTime;
     dbg("CpmModelC", "Node %i transmitting to %i, finishes at %llu.\n", sim_node(), dest, endTime);
 
     while (neighborEntry != NULL) {
@@ -449,9 +449,9 @@ implementation {
   }
     
 
-  command void Model.checkPendingTransmission(bool isTransmitting) {
-    transmitting = isTransmitting;
-    dbg("CpmModelC", "checkPendingTransmission: transmitting %i @ %s\n", transmitting, sim_time_string());
+  command void Model.setPendingTransmission() {
+    transmitting = TRUE;
+    dbg("CpmModelC", "setPendingTransmission: transmitting %i @ %s\n", transmitting, sim_time_string());
   }
 
   

diff --git a/tos/lib/tossim/GainRadioModel.nc b/tos/lib/tossim/GainRadioModel.nc
index 22691d8d88b2d0d880d208f9b8ef9499de2ef968..d7d7496f06c828f0b520429a10c6e00aba54f78d 100644 (file)
--- a/tos/lib/tossim/GainRadioModel.nc
+++ b/tos/lib/tossim/GainRadioModel.nc
@@ -46,7 +46,7 @@ interface GainRadioModel {
 
   command void setClearValue(double value);
   command bool clearChannel();
-  command void checkPendingTransmission(bool isTransmitting);
+  command void setPendingTransmission();
   
   event void acked(message_t* msg);
   event void receive(message_t* msg);

diff --git a/tos/lib/tossim/TossimPacketModelC.nc b/tos/lib/tossim/TossimPacketModelC.nc
index 44222e465ad38e15c2678c376f35f8b38601aecf..f887efca2ce27ca22f1ff8f0f94f970bb4baf9b6 100644 (file)
--- a/tos/lib/tossim/TossimPacketModelC.nc
+++ b/tos/lib/tossim/TossimPacketModelC.nc
@@ -214,7 +214,7 @@ implementation {
       delay *= (sim_ticks_per_sec() / sim_csma_symbols_per_sec());
       evt->time += delay;
       transmitting = TRUE;
-      call GainRadioModel.checkPendingTransmission(transmitting);
+      call GainRadioModel.setPendingTransmission();
       evt->handle = send_transmit;
       sim_queue_insert(evt);
     }