Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / rf230 / IEEE154NetworkLayerP.nc

diff --git a/tos/chips/rf230/IEEE154NetworkLayerP.nc b/tos/chips/rf230/IEEE154NetworkLayerP.nc
deleted file mode 100644 (file)
index f4abf63..0000000
--- a/tos/chips/rf230/IEEE154NetworkLayerP.nc
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2007, 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
- */
-
-module IEEE154NetworkLayerP
-{
-       provides
-       {
-               interface Send;
-               interface Receive;
-               interface Receive as NonTinyosReceive[uint8_t network];
-       }
-
-       uses
-       {
-               interface Send as SubSend;
-               interface Receive as SubReceive;
-
-               interface IEEE154Packet;
-       }
-}
-
-implementation
-{
-#ifndef TINYOS_6LOWPAN_NETWORK_ID
-#define TINYOS_6LOWPAN_NETWORK_ID 0x3f
-#endif
-
-       command error_t Send.send(message_t* msg, uint8_t len)
-       {
-               call IEEE154Packet.set6LowPan(msg, TINYOS_6LOWPAN_NETWORK_ID);
-               return call SubSend.send(msg, len);
-       }
-
-       command error_t Send.cancel(message_t* msg)
-       {
-               return call SubSend.cancel(msg);
-       }
-
-       command uint8_t Send.maxPayloadLength()
-       {
-               return call SubSend.maxPayloadLength();
-       }
-
-       command void* Send.getPayload(message_t* msg, uint8_t len)
-       {
-               return call SubSend.getPayload(msg, len);
-       }
-  
-       event void SubSend.sendDone(message_t* msg, error_t error)
-       {
-               signal Send.sendDone(msg, error);
-       }
-  
-       event message_t *SubReceive.receive(message_t *msg, void *payload, uint8_t len)
-       {
-               uint8_t network = call IEEE154Packet.get6LowPan(msg);
-               if( network == TINYOS_6LOWPAN_NETWORK_ID )
-                       return signal Receive.receive(msg, payload, len);
-               else
-                       return signal NonTinyosReceive.receive[network](msg, payload, len);
-       }
-
-       default event message_t *NonTinyosReceive.receive[uint8_t network](message_t *msg, void *payload, uint8_t len)
-       {
-               return msg;
-       }
-}