135u5 / tinyos-main

Automatically exported from code.google.com/p/tinyos-main
1 stars 0 forks source link

TOSSIM MainC includes TossimActiveMessageC instead of ActiveMessageC #6

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago
TOSSIM MainC includes TossimActiveMessageC which makes it hard for chip 
dependent radio drivers to override the default chip independent TOSSIM radio 
stack.

It is enough for MainC to include ActiveMessageC.  See the below diff which 
applies the changes to both the sim and sim-sf targets.

diff --git a/tos/lib/tossim/MainC.nc b/tos/lib/tossim/MainC.nc
index 4323d51..b0c0c7a 100644
--- a/tos/lib/tossim/MainC.nc
+++ b/tos/lib/tossim/MainC.nc
@@ -69,7 +69,7 @@ implementation {
   // the application does not wire this up to, e.g., ActiveMessageC,
   // the default handlers make sure nothing happens when a script
   // tries to deliver a packet to a node that has no radio stack.
-  components TossimActiveMessageC;
+  components ActiveMessageC;

 }

diff --git a/tos/lib/tossim/sf/sim/MainC.nc b/tos/lib/tossim/sf/sim/MainC.nc
index 819f25a..934b353 100644
--- a/tos/lib/tossim/sf/sim/MainC.nc
+++ b/tos/lib/tossim/sf/sim/MainC.nc
@@ -70,7 +70,7 @@ implementation {
   // the application does not wire this up to, e.g., ActiveMessageC,
   // the default handlers make sure nothing happens when a script
   // tries to deliver a packet to a node that has no radio stack.
-  components TossimActiveMessageC;
+  components ActiveMessageC;
   components SerialActiveMessageC;

 }

Original issue reported on code.google.com by mortenthansen on 18 Nov 2010 at 1:47

GoogleCodeExporter commented 8 years ago
Fixed.

Original comment by philip.l...@gmail.com on 19 Nov 2010 at 11:50