]> oss.titaniummirror.com Git - tinyos-2.x.git/commitdiff
add default Ieee154MessageC wiring
authormmaroti <mmaroti>
Thu, 17 Sep 2009 22:40:40 +0000 (22:40 +0000)
committermmaroti <mmaroti>
Thu, 17 Sep 2009 22:40:40 +0000 (22:40 +0000)
tos/platforms/iris/ActiveMessageC.nc
tos/platforms/iris/Ieee154MessageC.nc [new file with mode: 0644]

index 39f07fa252f2a495cceea721303b6857d946156e..b9273dac1a895cab81f8a8648b80550f8babe9ff 100644 (file)
@@ -30,6 +30,8 @@ configuration ActiveMessageC
                interface AMSend[uint8_t id];
                interface Receive[uint8_t id];
                interface Receive as Snoop[uint8_t id];
+               interface SendNotifier[am_id_t id];
+
                interface Packet;
                interface AMPacket;
 
@@ -49,17 +51,21 @@ implementation
        components RF230ActiveMessageC as MAC;
 
        SplitControl    = MAC;
+
        AMSend          = MAC;
        Receive         = MAC.Receive;
        Snoop           = MAC.Snoop;
+       SendNotifier    = MAC;
+
        Packet          = MAC;
        AMPacket        = MAC;
+
+       PacketAcknowledgements  = MAC;
+       LowPowerListening       = MAC;
 #ifdef PACKET_LINK
        PacketLink      = MAC;
 #endif
 
-       PacketAcknowledgements  = MAC;
-       LowPowerListening       = MAC;
        PacketTimeStampMilli    = MAC;
        PacketTimeStampMicro    = MAC;
 }
diff --git a/tos/platforms/iris/Ieee154MessageC.nc b/tos/platforms/iris/Ieee154MessageC.nc
new file mode 100644 (file)
index 0000000..9e2de9e
--- /dev/null
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2009, Vanderbilt University
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE VANDERBILT UNIVERSITY BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE VANDERBILT
+ * UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE VANDERBILT UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE VANDERBILT UNIVERSITY HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Author: Miklos Maroti
+ */
+
+configuration ActiveMessageC
+{
+       provides
+       {
+               interface SplitControl;
+
+               interface Ieee154Send;
+               interface Receive as Ieee154Receive;
+               interface SendNotifier;
+
+               interface Packet;
+               interface Ieee154Packet;
+
+               interface PacketAcknowledgements;
+               interface LowPowerListening;
+               interface PacketLink;
+
+               interface PacketTimeStamp<TMicro, uint32_t> as PacketTimeStampMicro;
+               interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
+       }
+}
+
+implementation
+{
+       components RF230Ieee154MessageC as MAC;
+
+       SplitControl    = MAC;
+
+       Ieee154Send     = MAC;
+       Ieee154Receive  = MAC.Receive;
+       SendNotifier    = MAC;
+
+       Packet          = MAC;
+       Ieee154Packet   = MAC;
+
+       PacketAcknowledgements  = MAC;
+       LowPowerListening       = MAC;
+       PacketLink      = MAC;
+
+       PacketTimeStampMilli    = MAC;
+       PacketTimeStampMicro    = MAC;
+}