[Tinyos-2-commits] CVS: tinyos-2.x/tos/sensorboards/mda100 ArbitratedTempDeviceP.nc, 1.1, 1.2 TempC.nc, 1.1, 1.2 SharedAnalogDeviceC.nc, 1.1, 1.2

Tue Jun 10 17:42:18 PDT 2008

Update of /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mda100
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9551/sensorboards/mda100

Modified Files:
	ArbitratedTempDeviceP.nc TempC.nc SharedAnalogDeviceC.nc 
Log Message:
Convert to Unix-style line terminators.


Index: ArbitratedTempDeviceP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mda100/ArbitratedTempDeviceP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArbitratedTempDeviceP.nc	21 Aug 2007 04:44:09 -0000	1.1
--- ArbitratedTempDeviceP.nc	11 Jun 2008 00:42:15 -0000	1.2
***************
*** 1,49 ****
! /*
!  * Copyright (c) 2007 Stanford University.
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
!  * - Redistributions of source code must retain the above copyright
!  *   notice, this list of conditions and the following disclaimer.
!  * - Redistributions in binary form must reproduce the above copyright
!  *   notice, this list of conditions and the following disclaimer in the
!  *   documentation and/or other materials provided with the
!  *   distribution.
!  * - Neither the name of the Stanford University nor the names of
!  *   its contributors may be used to endorse or promote products derived
!  *   from this software without specific prior written permission.
!  *
!  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
!  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
!  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
!  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL STANFORD
!  * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
!  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
!  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
!  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
!  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
!  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
!  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
!  * OF THE POSSIBILITY OF SUCH DAMAGE.
!  */
! 
! /**
!  * @author Kevin Klues <klueska at cs.stanford.edu>
!  * @date August 20th, 2007
!  */
! 
! configuration ArbitratedTempDeviceP
! {
!   provides interface Read<uint16_t>[uint8_t client];
! }
! implementation
! {
!   components TempImplP,
!     new ArbitratedReadC(uint16_t) as ArbitrateRead;
! 
!   Read = ArbitrateRead;
!   ArbitrateRead.Service -> TempImplP.Read;
!   ArbitrateRead.Resource -> TempImplP.Resource;
! }
--- 1,49 ----
! /*
!  * Copyright (c) 2007 Stanford University.
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
!  * - Redistributions of source code must retain the above copyright
!  *   notice, this list of conditions and the following disclaimer.
!  * - Redistributions in binary form must reproduce the above copyright
!  *   notice, this list of conditions and the following disclaimer in the
!  *   documentation and/or other materials provided with the
!  *   distribution.
!  * - Neither the name of the Stanford University nor the names of
!  *   its contributors may be used to endorse or promote products derived
!  *   from this software without specific prior written permission.
!  *
!  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
!  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
!  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
!  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL STANFORD
!  * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
!  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
!  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
!  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
!  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
!  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
!  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
!  * OF THE POSSIBILITY OF SUCH DAMAGE.
!  */
! 
! /**
!  * @author Kevin Klues <klueska at cs.stanford.edu>
!  * @date August 20th, 2007
!  */
! 
! configuration ArbitratedTempDeviceP
! {
!   provides interface Read<uint16_t>[uint8_t client];
! }
! implementation
! {
!   components TempImplP,
!     new ArbitratedReadC(uint16_t) as ArbitrateRead;
! 
!   Read = ArbitrateRead;
!   ArbitrateRead.Service -> TempImplP.Read;
!   ArbitrateRead.Resource -> TempImplP.Resource;
! }

Index: TempC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mda100/TempC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TempC.nc	21 Aug 2007 04:44:09 -0000	1.1
--- TempC.nc	11 Jun 2008 00:42:15 -0000	1.2
***************
*** 1,25 ****
! /* $Id$
!  * Copyright (c) 2006 Intel Corporation
!  * All rights reserved.
!  *
!  * This file is distributed under the terms in the attached INTEL-LICENSE     
!  * file. If you do not find these files, copies can be found by writing to
!  * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
!  * 94704.  Attention:  Intel License Inquiry.
!  */
! /**
!  * Photodiode of the mda100 sensor board.
!  * 
!  * @author David Gay
!  */
! 
! #include "mda100.h"
! 
! generic configuration TempC() {
!   provides interface Read<uint16_t>;
! }
! implementation {
!   components ArbitratedTempDeviceP;
! 
!   Read = ArbitratedTempDeviceP.Read[unique(UQ_MDA100_TEMP_RESOURCE)];
! }
--- 1,25 ----
! /* $Id$
!  * Copyright (c) 2006 Intel Corporation
!  * All rights reserved.
!  *
!  * This file is distributed under the terms in the attached INTEL-LICENSE     
!  * file. If you do not find these files, copies can be found by writing to
!  * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
!  * 94704.  Attention:  Intel License Inquiry.
!  */
! /**
!  * Photodiode of the mda100 sensor board.
!  * 
!  * @author David Gay
!  */
! 
! #include "mda100.h"
! 
! generic configuration TempC() {
!   provides interface Read<uint16_t>;
! }
! implementation {
!   components ArbitratedTempDeviceP;
! 
!   Read = ArbitratedTempDeviceP.Read[unique(UQ_MDA100_TEMP_RESOURCE)];
! }

Index: SharedAnalogDeviceC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mda100/SharedAnalogDeviceC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SharedAnalogDeviceC.nc	21 Aug 2007 04:44:09 -0000	1.1
--- SharedAnalogDeviceC.nc	11 Jun 2008 00:42:15 -0000	1.2
***************
*** 1,65 ****
! /*
!  * Copyright (c) 2007 Stanford University.
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
!  * - Redistributions of source code must retain the above copyright
!  *   notice, this list of conditions and the following disclaimer.
!  * - Redistributions in binary form must reproduce the above copyright
!  *   notice, this list of conditions and the following disclaimer in the
!  *   documentation and/or other materials provided with the
!  *   distribution.
!  * - Neither the name of the Stanford University nor the names of
!  *   its contributors may be used to endorse or promote products derived
!  *   from this software without specific prior written permission.
!  *
!  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
!  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
!  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
!  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL STANFORD
!  * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
!  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
!  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
!  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
!  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
!  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
!  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
!  * OF THE POSSIBILITY OF SUCH DAMAGE.
!  */
! 
! /**
!  * @author Kevin Klues <klueska at cs.stanford.edu>
!  * @date August 20th, 2007
!  */
! 
! generic configuration SharedAnalogDeviceC(char resourceName[], uint32_t startup_delay) {
!   provides {
!     interface Resource[uint8_t];
!     interface Read<uint16_t>[uint8_t];
!   }
!   uses {
!     interface Atm128AdcConfig as AdcConfig;
!     interface GeneralIO as EnablePin;
!   } 
! }
! implementation {
!   components new RoundRobinArbiterC(resourceName) as Arbiter;
!   components new SplitControlPowerManagerC() as PowerManager;
!   components new SharedAnalogDeviceP(startup_delay) as AnalogDevice;
!   components new AdcReadNowClientC() as Adc;
!   components new TimerMilliC();
!   Resource = Arbiter;
!   Read = AnalogDevice;
! 
!   PowerManager.ArbiterInfo -> Arbiter;
!   PowerManager.SplitControl -> AnalogDevice;
!   PowerManager.ResourceDefaultOwner -> Arbiter;
!   AnalogDevice.ActualRead -> Adc;
!   AnalogDevice.Timer -> TimerMilliC;
!   AnalogDevice.AnalogDeviceResource -> Adc;
! 
!   Adc.Atm128AdcConfig = AdcConfig;
!   AnalogDevice.EnablePin = EnablePin;
! }
--- 1,65 ----
! /*
!  * Copyright (c) 2007 Stanford University.
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
!  * - Redistributions of source code must retain the above copyright
!  *   notice, this list of conditions and the following disclaimer.
!  * - Redistributions in binary form must reproduce the above copyright
!  *   notice, this list of conditions and the following disclaimer in the
!  *   documentation and/or other materials provided with the
!  *   distribution.
!  * - Neither the name of the Stanford University nor the names of
!  *   its contributors may be used to endorse or promote products derived
!  *   from this software without specific prior written permission.
!  *
!  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
!  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
!  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
!  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL STANFORD
!  * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
!  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
!  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
!  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
!  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
!  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
!  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
!  * OF THE POSSIBILITY OF SUCH DAMAGE.
!  */
! 
! /**
!  * @author Kevin Klues <klueska at cs.stanford.edu>
!  * @date August 20th, 2007
!  */
! 
! generic configuration SharedAnalogDeviceC(char resourceName[], uint32_t startup_delay) {
!   provides {
!     interface Resource[uint8_t];
!     interface Read<uint16_t>[uint8_t];
!   }
!   uses {
!     interface Atm128AdcConfig as AdcConfig;
!     interface GeneralIO as EnablePin;
!   } 
! }
! implementation {
!   components new RoundRobinArbiterC(resourceName) as Arbiter;
!   components new SplitControlPowerManagerC() as PowerManager;
!   components new SharedAnalogDeviceP(startup_delay) as AnalogDevice;
!   components new AdcReadNowClientC() as Adc;
!   components new TimerMilliC();
!   Resource = Arbiter;
!   Read = AnalogDevice;
! 
!   PowerManager.ArbiterInfo -> Arbiter;
!   PowerManager.SplitControl -> AnalogDevice;
!   PowerManager.ResourceDefaultOwner -> Arbiter;
!   AnalogDevice.ActualRead -> Adc;
!   AnalogDevice.Timer -> TimerMilliC;
!   AnalogDevice.AnalogDeviceResource -> Adc;
! 
!   Adc.Atm128AdcConfig = AdcConfig;
!   AnalogDevice.EnablePin = EnablePin;
! }