reversing the C/AppC convention is confusing

diff --git a/apps/tests/TestFtsp/Makefile b/apps/tests/TestFtsp/Makefile
index eb8f79a6c03478d84ace61f40fb4f6d68c59c8f7..25cb720217371e2274a554b748747dbba5a8015e 100644 (file)
--- a/apps/tests/TestFtsp/Makefile
+++ b/apps/tests/TestFtsp/Makefile
@@ -7,7 +7,7 @@ FtspDataLogger.class: TestFtspMsg.java
 TestFtspMsg.java: TestFtsp.h
        mig java -target=$(PLATFORM) $(CFLAGS) -java-classname=TestFtspMsg TestFtsp.h test_ftsp_msg -o $@
 
-COMPONENT=TestFtspC
+COMPONENT=TestFtspAppC
 
 PFLAGS += -DTIMESYNC_RATE=3
 #PFLAGS += -DTIMESYNC_DEBUG

diff --git a/apps/tests/TestFtsp/TestFtspAppC.nc b/apps/tests/TestFtsp/TestFtspAppC.nc
index 11d8ea8da50bd15a1f8cdc468a847755c7c1288c..d30adcd898bb4cbed576a5dc55d8bc5c45aea971 100644 (file)
--- a/apps/tests/TestFtsp/TestFtspAppC.nc
+++ b/apps/tests/TestFtsp/TestFtspAppC.nc
@@ -25,63 +25,29 @@
 #include "TestFtsp.h"
 #include "RadioCountToLeds.h"
 
-module TestFtspAppC
-{
-    uses
-    {
-        interface GlobalTime<TMilli>;
-        interface TimeSyncInfo;
-        interface Receive;
-        interface AMSend;
-        interface Packet;
-        interface Leds;
-        interface PacketTimeStamp<TMilli,uint32_t>;
-        interface Boot;
-        interface SplitControl as RadioControl;
-    }
+configuration TestFtspAppC {
 }
 
-implementation
-{
-    message_t msg;
-    bool locked = FALSE;
+implementation {
+  components MainC, TimeSyncC;
 
-    event void Boot.booted() {
-        call RadioControl.start();
-    }
+  MainC.SoftwareInit -> TimeSyncC;
+  TimeSyncC.Boot -> MainC;
 
-    event message_t* Receive.receive(message_t* msgPtr, void* payload, uint8_t len)
-    {
-        call Leds.led0Toggle();
-        if (!locked && call PacketTimeStamp.isValid(msgPtr)) {
-            radio_count_msg_t* rcm = (radio_count_msg_t*)call Packet.getPayload(msgPtr, sizeof(radio_count_msg_t));
-            test_ftsp_msg_t* report = (test_ftsp_msg_t*)call Packet.getPayload(&msg, sizeof(test_ftsp_msg_t));
+  components TestFtspC as App;
+  App.Boot -> MainC;
 
-            uint32_t rxTimestamp = call PacketTimeStamp.timestamp(msgPtr);
+  components ActiveMessageC;
+  App.RadioControl -> ActiveMessageC;
+  App.Receive -> ActiveMessageC.Receive[AM_RADIO_COUNT_MSG];
+  App.AMSend -> ActiveMessageC.AMSend[AM_TEST_FTSP_MSG];
+  App.Packet -> ActiveMessageC;
+  App.PacketTimeStamp -> ActiveMessageC;
 
-            report->src_addr = TOS_NODE_ID;
-            report->counter = rcm->counter;
-            report->local_rx_timestamp = rxTimestamp;
-            report->is_synced = call GlobalTime.local2Global(&rxTimestamp);
-            report->global_rx_timestamp = rxTimestamp;
-            report->skew_times_1000000 = (uint32_t)call TimeSyncInfo.getSkew()*1000000UL;
-            report->ftsp_root_addr = call TimeSyncInfo.getRootID();
-            report->ftsp_seq = call TimeSyncInfo.getSeqNum();
-            report->ftsp_table_entries = call TimeSyncInfo.getNumEntries();
+  components LedsC;
 
-            if (call AMSend.send(AM_BROADCAST_ADDR, &msg, sizeof(test_ftsp_msg_t)) == SUCCESS) {
-              locked = TRUE;
-            }
-        }
+  App.GlobalTime -> TimeSyncC;
+  App.TimeSyncInfo -> TimeSyncC;
+  App.Leds -> LedsC;
 
-        return msgPtr;
-    }
-
-    event void AMSend.sendDone(message_t* ptr, error_t success) {
-        locked = FALSE;
-        return;
-    }
-
-    event void RadioControl.startDone(error_t err) {}
-    event void RadioControl.stopDone(error_t error){}
 }

diff --git a/apps/tests/TestFtsp/TestFtspC.nc b/apps/tests/TestFtsp/TestFtspC.nc
index e0a0ea2c372f996c635482f3b18215ab842b91e8..304da1befaae28ea7219f5455deb58bcfb42cc3f 100644 (file)
--- a/apps/tests/TestFtsp/TestFtspC.nc
+++ b/apps/tests/TestFtsp/TestFtspC.nc
@@ -25,29 +25,63 @@
 #include "TestFtsp.h"
 #include "RadioCountToLeds.h"
 
-configuration TestFtspC {
+module TestFtspC
+{
+    uses
+    {
+        interface GlobalTime<TMilli>;
+        interface TimeSyncInfo;
+        interface Receive;
+        interface AMSend;
+        interface Packet;
+        interface Leds;
+        interface PacketTimeStamp<TMilli,uint32_t>;
+        interface Boot;
+        interface SplitControl as RadioControl;
+    }
 }
 
-implementation {
-  components MainC, TimeSyncC;
+implementation
+{
+    message_t msg;
+    bool locked = FALSE;
 
-  MainC.SoftwareInit -> TimeSyncC;
-  TimeSyncC.Boot -> MainC;
+    event void Boot.booted() {
+        call RadioControl.start();
+    }
 
-  components TestFtspAppC as App;
-  App.Boot -> MainC;
+    event message_t* Receive.receive(message_t* msgPtr, void* payload, uint8_t len)
+    {
+        call Leds.led0Toggle();
+        if (!locked && call PacketTimeStamp.isValid(msgPtr)) {
+            radio_count_msg_t* rcm = (radio_count_msg_t*)call Packet.getPayload(msgPtr, sizeof(radio_count_msg_t));
+            test_ftsp_msg_t* report = (test_ftsp_msg_t*)call Packet.getPayload(&msg, sizeof(test_ftsp_msg_t));
 
-  components ActiveMessageC;
-  App.RadioControl -> ActiveMessageC;
-  App.Receive -> ActiveMessageC.Receive[AM_RADIO_COUNT_MSG];
-  App.AMSend -> ActiveMessageC.AMSend[AM_TEST_FTSP_MSG];
-  App.Packet -> ActiveMessageC;
-  App.PacketTimeStamp -> ActiveMessageC;
+            uint32_t rxTimestamp = call PacketTimeStamp.timestamp(msgPtr);
 
-  components LedsC;
+            report->src_addr = TOS_NODE_ID;
+            report->counter = rcm->counter;
+            report->local_rx_timestamp = rxTimestamp;
+            report->is_synced = call GlobalTime.local2Global(&rxTimestamp);
+            report->global_rx_timestamp = rxTimestamp;
+            report->skew_times_1000000 = (uint32_t)call TimeSyncInfo.getSkew()*1000000UL;
+            report->ftsp_root_addr = call TimeSyncInfo.getRootID();
+            report->ftsp_seq = call TimeSyncInfo.getSeqNum();
+            report->ftsp_table_entries = call TimeSyncInfo.getNumEntries();
 
-  App.GlobalTime -> TimeSyncC;
-  App.TimeSyncInfo -> TimeSyncC;
-  App.Leds -> LedsC;
+            if (call AMSend.send(AM_BROADCAST_ADDR, &msg, sizeof(test_ftsp_msg_t)) == SUCCESS) {
+              locked = TRUE;
+            }
+        }
 
+        return msgPtr;
+    }
+
+    event void AMSend.sendDone(message_t* ptr, error_t success) {
+        locked = FALSE;
+        return;
+    }
+
+    event void RadioControl.startDone(error_t err) {}
+    event void RadioControl.stopDone(error_t error){}
 }