Change to follow TEP 109 .

[tinyos-2.x.git] / tos / sensorboards / mts300 / PhotoC.nc

diff --git a/tos/sensorboards/mts300/PhotoC.nc b/tos/sensorboards/mts300/PhotoC.nc
index 38f788ea2ab3317f2b7c07165171b97577d9f35b..d6acb651efea1e5f43f47e228f1d1c913637ebf9 100644 (file)
--- a/tos/sensorboards/mts300/PhotoC.nc
+++ b/tos/sensorboards/mts300/PhotoC.nc
@@ -1,49 +1,25 @@
-/**
- *  Copyright (c) 2005-2006 Crossbow Technology, Inc.
- *  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 (updated) modification history and the author appear in
- *  all copies of this source code.
- *
- *  Permission is also granted to distribute this software under the
- *  standard BSD license as contained in the TinyOS distribution.
+/* $Id$
+ * Copyright (c) 2006 Intel Corporation
+ * All rights reserved.
  *
- *  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 THE COPYRIGHT HOLDERS OR CONTRIBUTORS
- *  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
- *  OR PROFITS) 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.
+ * 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.
  */
- /*
- *  @author Hu Siquan <husq@xbow.com>
- *
- *  $Id$
+/**
+ * Photodiode of the mts300 sensor board.
+ * 
+ * @author David Gay
  */
 
 #include "mts300.h"
 
-generic configuration PhotoC()
-{
+generic configuration PhotoC() {
   provides interface Read<uint16_t>;
-  provides interface StdControl;
-  provides interface Init;
 }
-implementation
-{
-  components new AdcReadClientC(), PhotoTempDeviceP;
-
-  Init = PhotoTempDeviceP;
-  StdControl = PhotoTempDeviceP;
+implementation {
+  components ArbitratedPhotoDeviceP;
 
-  Read = AdcReadClientC;
-  AdcReadClientC.Atm128AdcConfig -> PhotoTempDeviceP.PhotoAtm128AdcConfig;
-  AdcReadClientC.ResourceConfigure -> PhotoTempDeviceP.PhotoResourceConfigure;
+  Read = ArbitratedPhotoDeviceP.Read[unique(UQ_PHOTO_RESOURCE)];
 }