[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/telosa MoteClockC.nc, NONE, 1.1 PlatformC.nc, 1.4, 1.5 PlatformP.nc, 1.2, 1.3

[Vlado Handziski]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6336/platforms/telosa

Modified Files:
	PlatformC.nc PlatformP.nc 
Added Files:
	MoteClockC.nc 
Log Message:
- Set DCO calibrate target back to 4096 binary kHz
- Add new command/event in Msp430ClockInit to enable overriding of the startup values for the DCO calibrate routine
- Modify PlatformC/PlatformP in platform/telosa to use intermediate configuration MoteClockC that can be used to override the default clock initialization via MoteClockP
- Add MoteClockC and MoteClockP in platform/telosb to allow for usage of the DCOR flag / ROSC on tmote sky. The overriding configuration is currently disabled pending closer review of the calibration routine behavior for the new setup and other potential gotchas

--- NEW FILE: MoteClockC.nc ---
/*
 * Copyright (c) 2007, Technische Universitaet Berlin
 * 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 Technische Universität Berlin 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 THE COPYRIGHT
 * OWNER OR 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.
 *
 * $Id: MoteClockC.nc,v 1.1 2007/07/10 00:24:31 vlahan Exp $
 *
 */

 /**
 * @author Vlado Handziski <handzisk at tkn.tu-berlind.de>
 */
 
configuration MoteClockC
{
  provides interface Init as MoteClockInit;
}
implementation

{
  components Msp430ClockC;
  
  MoteClockInit = Msp430ClockC.Init;
}

Index: PlatformC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/PlatformC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PlatformC.nc	12 Dec 2006 18:23:44 -0000	1.4
--- PlatformC.nc	10 Jul 2007 00:24:31 -0000	1.5
***************
*** 33,40 ****
  implementation
  {
!   components PlatformP, MotePlatformC, Msp430ClockC;
  
    Init = PlatformP;
!   PlatformP.Msp430ClockInit -> Msp430ClockC.Init;
    PlatformP.MoteInit -> MotePlatformC;
  }
--- 33,40 ----
  implementation
  {
!   components PlatformP, MotePlatformC, MoteClockC;
  
    Init = PlatformP;
!   PlatformP.MoteClockInit -> MoteClockC;
    PlatformP.MoteInit -> MotePlatformC;
  }

Index: PlatformP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/PlatformP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PlatformP.nc	12 Jul 2006 17:03:04 -0000	1.2
--- PlatformP.nc	10 Jul 2007 00:24:31 -0000	1.3
***************
*** 3,7 ****
  module PlatformP{
    provides interface Init;
!   uses interface Init as Msp430ClockInit;
    uses interface Init as MoteInit;
    uses interface Init as LedsInit;
--- 3,7 ----
  module PlatformP{
    provides interface Init;
!   uses interface Init as MoteClockInit;
    uses interface Init as MoteInit;
    uses interface Init as LedsInit;
***************
*** 9,13 ****
  implementation {
    command error_t Init.init() {
!     call Msp430ClockInit.init();
      call MoteInit.init();
      call LedsInit.init();
--- 9,13 ----
  implementation {
    command error_t Init.init() {
!     call MoteClockInit.init();
      call MoteInit.init();
      call LedsInit.init();