[Tinyos-2-commits] CVS: tinyos-2.x/tos/sensorboards/mts300 MagReadP.nc, NONE, 1.1 MagReadStreamP.nc, NONE, 1.1 MagXC.nc, NONE, 1.1 MagXStreamC.nc, NONE, 1.1 MagYC.nc, NONE, 1.1 MagYStreamC.nc, NONE, 1.1

Tue Mar 13 22:38:39 PDT 2007

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

Added Files:
	MagReadP.nc MagReadStreamP.nc MagXC.nc MagXStreamC.nc MagYC.nc 
	MagYStreamC.nc 
Log Message:
Change to follow TEP 109 .

--- NEW FILE: MagReadP.nc ---
// $Id: MagReadP.nc,v 1.1 2007/03/14 05:38:37 pipeng Exp $

/*									tab:4
 * "Copyright (c) 2000-2003 The Regents of the University  of California.
 * 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 UNIVERSITY OF CALIFORNIA 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 UNIVERSITY OF
 * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * THE UNIVERSITY OF CALIFORNIA 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 UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
 * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
 *
 * Copyright (c) 2002-2003 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.
 */
#include "mts300.h"

configuration MagReadP 
{
  provides 
  {
    interface Mag;
    interface Read<uint16_t> as MagX[uint8_t client];
    interface Read<uint16_t> as MagY[uint8_t client];
  }
  uses
  {
    interface Read<uint16_t> as ActualX[uint8_t client];
    interface Read<uint16_t> as ActualY[uint8_t client];
  }
}
implementation
{
  components MagConfigP,
    new ArbitratedReadC(uint16_t) as AdcX,
    new ArbitratedReadC(uint16_t) as AdcY;

  Mag = MagConfigP;

  MagX = AdcX;
  AdcX.Resource -> MagConfigP;
  AdcX.Service = ActualX;

  MagY = AdcY;
  AdcY.Resource -> MagConfigP;
  AdcY.Service = ActualY;
}

--- NEW FILE: MagReadStreamP.nc ---
// $Id: MagReadStreamP.nc,v 1.1 2007/03/14 05:38:37 pipeng Exp $

/*									tab:4
 * "Copyright (c) 2000-2003 The Regents of the University  of California.
 * 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 UNIVERSITY OF CALIFORNIA 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 UNIVERSITY OF
 * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * THE UNIVERSITY OF CALIFORNIA 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 UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
 * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
 *
 * Copyright (c) 2002-2003 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.
 */
#include "mts300.h"

configuration MagReadStreamP
{
  provides {
    interface Mag;
    interface ReadStream<uint16_t> as ReadStreamX[uint8_t client];
    interface ReadStream<uint16_t> as ReadStreamY[uint8_t client];
  }
  uses {
    interface ReadStream<uint16_t> as ActualX[uint8_t client];
    interface ReadStream<uint16_t> as ActualY[uint8_t client];
  }
}
implementation
{
  enum {
    NMAG_CLIENTS = uniqueCount(UQ_MAG_RESOURCE)
  };
  components MagConfigP,
    new ArbitratedReadStreamC(NMAG_CLIENTS, uint16_t) as MultiplexX,
    new ArbitratedReadStreamC(NMAG_CLIENTS, uint16_t) as MultiplexY;

  Mag = MagConfigP;

  ReadStreamX = MultiplexX;
  MultiplexX.Resource -> MagConfigP;
  MultiplexX.Service = ActualX;

  ReadStreamY = MultiplexY;
  MultiplexY.Resource -> MagConfigP;
  MultiplexY.Service = ActualY;
}
--- NEW FILE: MagXC.nc ---
/* $Id: MagXC.nc,v 1.1 2007/03/14 05:38:37 pipeng Exp $
 * 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.
 */
/**
 * @author Alif Chen
 */

#include "mts300.h"

generic configuration MagXC()
{
  provides interface Mag;
  provides interface Read<uint16_t>;
}
implementation {
  enum {
    ID = unique(UQ_MAG_RESOURCE)
  };

  components MagReadP,MagConfigP, new AdcReadClientC() as AdcX;

  Mag = MagReadP;

  Read = MagReadP.MagX[ID];
  MagReadP.ActualX[ID] -> AdcX;
  AdcX.Atm128AdcConfig -> MagConfigP.ConfigX;
}

--- NEW FILE: MagXStreamC.nc ---
/* $Id: MagXStreamC.nc,v 1.1 2007/03/14 05:38:37 pipeng Exp $
 * 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.
 */
/**
 * 
 * @author Alif Chen
 */

#include "mts300.h"

generic configuration MagXStreamC() {
  provides interface ReadStream<uint16_t>;
  provides interface Mag;
}
implementation {
  enum {
    ID = unique(UQ_ACCEL_RESOURCE)
  };
  components MagReadStreamP, MagConfigP, new AdcReadStreamClientC();

  Mag = MagReadStreamP;

  ReadStream = MagReadStreamP.ReadStreamX[ID];
  MagReadStreamP.ActualX[ID] -> AdcReadStreamClientC;
  AdcReadStreamClientC.Atm128AdcConfig -> MagConfigP.ConfigX;
}

--- NEW FILE: MagYC.nc ---
/* $Id: MagYC.nc,v 1.1 2007/03/14 05:38:37 pipeng Exp $
 * 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.
 */
/**
 * @author Alif Chen
 */

#include "mts300.h"

generic configuration MagYC()
{
  provides interface Mag;
  provides interface Read<uint16_t>;
}
implementation {
  enum {
    ID = unique(UQ_MAG_RESOURCE)
  };

  components MagReadP,MagConfigP, new AdcReadClientC() as AdcY;

  Mag = MagReadP;

  Read = MagReadP.MagY[ID];
  MagReadP.ActualY[ID] -> AdcY;
  AdcY.Atm128AdcConfig -> MagConfigP.ConfigY;
}

--- NEW FILE: MagYStreamC.nc ---
/* $Id: MagYStreamC.nc,v 1.1 2007/03/14 05:38:37 pipeng Exp $
 * 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.
 */
/**
 * @author Alif Chen
 */

#include "mts300.h"

generic configuration MagYStreamC() {
  provides interface ReadStream<uint16_t>;
  provides interface Mag;
}
implementation {
  enum {
    ID = unique(UQ_ACCEL_RESOURCE)
  };
  components MagReadStreamP, MagConfigP, new AdcReadStreamClientC();

  Mag = MagReadStreamP;

  ReadStream = MagReadStreamP.ReadStreamY[ID];
  MagReadStreamP.ActualY[ID] -> AdcReadStreamClientC;
  AdcReadStreamClientC.Atm128AdcConfig -> MagConfigP.ConfigY;
}