[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 DummyLayerP.nc, NONE, 1.1 DefaultMacC.nc, 1.8, 1.9 DummyLayerC.nc, 1.2, 1.3 LowPowerListeningLayerC.nc, 1.2, 1.3

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5895

Modified Files:
	DefaultMacC.nc DummyLayerC.nc LowPowerListeningLayerC.nc 
Added Files:
	DummyLayerP.nc 
Log Message:
resurrect the dummy low power listening

--- NEW FILE: DummyLayerP.nc ---
/*
 * 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 DummyLayerP
{
	provides interface LowPowerListening;
}

implementation
{
	command void LowPowerListening.setLocalSleepInterval(uint16_t sleepIntervalMs) { }

	command uint16_t LowPowerListening.getLocalSleepInterval() { return 0; }
  
	command void LowPowerListening.setLocalDutyCycle(uint16_t dutyCycle) { }
  
	command uint16_t LowPowerListening.getLocalDutyCycle() { return 10000; }
  
	command void LowPowerListening.setRxSleepInterval(message_t *msg, uint16_t sleepIntervalMs) { }
  
	command uint16_t LowPowerListening.getRxSleepInterval(message_t *msg) { return 0; }
  
	command void LowPowerListening.setRxDutyCycle(message_t *msg, uint16_t dutyCycle) { }
  
	command uint16_t LowPowerListening.getRxDutyCycle(message_t *msg) { return 10000; }
  
	command uint16_t LowPowerListening.dutyCycleToSleepInterval(uint16_t dutyCycle) { return 0; }

	command uint16_t LowPowerListening.sleepIntervalToDutyCycle(uint16_t sleepInterval) { return 10000; }
}

Index: DefaultMacC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/DefaultMacC.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DefaultMacC.nc	13 May 2008 19:48:00 -0000	1.8
--- DefaultMacC.nc	15 May 2008 07:04:12 -0000	1.9
***************
*** 73,86 ****
  
  	components ActiveMessageLayerC;
! #if defined(LOW_POWER_LISTENING)
  	components LowPowerListeningLayerC;
  #else	
  	components new DummyLayerC() as LowPowerListeningLayerC;
! #endif	
  	components MessageBufferLayerC;
  	components UniqueLayerC;
  	components TrafficMonitorLayerC;
  	components RandomCollisionLayerC as CollisionAvoidanceLayerC;
! //	components SlottedCollisionLayerC as CollisionAvoidanceLayerC;
  	components SoftwareAckLayerC;
  	components new DummyLayerC() as CsmaLayerC;
--- 73,89 ----
  
  	components ActiveMessageLayerC;
! #ifdef LOW_POWER_LISTENING
  	components LowPowerListeningLayerC;
  #else	
  	components new DummyLayerC() as LowPowerListeningLayerC;
! #endif
  	components MessageBufferLayerC;
  	components UniqueLayerC;
  	components TrafficMonitorLayerC;
+ #ifdef RF230_SLOTTED_MAC
+ 	components SlottedCollisionLayerC as CollisionAvoidanceLayerC;
+ #else
  	components RandomCollisionLayerC as CollisionAvoidanceLayerC;
! #endif
  	components SoftwareAckLayerC;
  	components new DummyLayerC() as CsmaLayerC;
***************
*** 103,109 ****
--- 106,114 ----
  	LowPowerListeningLayerC.SubSend -> MessageBufferLayerC;
  	LowPowerListeningLayerC.SubReceive -> MessageBufferLayerC;
+ #ifdef LOW_POWER_LISTENING
  	LowPowerListeningLayerC.PacketSleepInterval -> DefaultPacketC;
  	LowPowerListeningLayerC.IEEE154Packet -> IEEE154PacketC;
  	LowPowerListeningLayerC.PacketAcknowledgements -> DefaultPacketC;
+ #endif
  
  	MessageBufferLayerC.Packet -> DefaultPacketC;

Index: DummyLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/DummyLayerC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DummyLayerC.nc	22 Apr 2008 10:55:20 -0000	1.2
--- DummyLayerC.nc	15 May 2008 07:04:12 -0000	1.3
***************
*** 37,43 ****
  
  		interface DummyConfig as UnconnectedConfig;
- 		interface PacketField<uint16_t> as UnconnectedPacketSleepInterval;
- 		interface IEEE154Packet as UnconnectedIEEE154Packet;
- 		interface PacketAcknowledgements as UnconnectedPacketAcknowledgments;
  	}
  
--- 37,40 ----
***************
*** 53,61 ****
  
  		interface DummyConfig as Config;
- 		interface PacketField<uint16_t> as PacketSleepInterval;
- 		interface IEEE154Packet;
- 		interface PacketAcknowledgements;
- 
- 		interface LowPowerListening as UnconnectedLowPowerListening;
  	}
  }
--- 50,53 ----
***************
*** 73,79 ****
  
  	Config = UnconnectedConfig;
! 	PacketSleepInterval = UnconnectedPacketSleepInterval;
! 	IEEE154Packet = UnconnectedIEEE154Packet;
! 	PacketAcknowledgements = UnconnectedPacketAcknowledgments;
! 	LowPowerListening = UnconnectedLowPowerListening;
  }
--- 65,70 ----
  
  	Config = UnconnectedConfig;
! 
! 	components DummyLayerP;
! 	LowPowerListening = DummyLayerP.LowPowerListening;
  }

Index: LowPowerListeningLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/LowPowerListeningLayerC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LowPowerListeningLayerC.nc	22 Apr 2008 10:55:20 -0000	1.2
--- LowPowerListeningLayerC.nc	15 May 2008 07:04:12 -0000	1.3
***************
*** 22,25 ****
--- 22,27 ----
   */
  
+ #warning "*** USING LOW POWER LISTENING LAYER"
+ 
  configuration LowPowerListeningLayerC
  {