[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/timer Msp430DcoSpec.h, NONE, 1.1 Msp430ClockP.nc, 1.4, 1.5

[akoepke]

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

Modified Files:
	Msp430ClockP.nc 
Added Files:
	Msp430DcoSpec.h 
Log Message:
cpu frequency factored out, makes it overridable.


--- NEW FILE: Msp430DcoSpec.h ---
/* -*- mode:c++; indent-tabs-mode: nil -*-
 * 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 Universitaet 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.
 */

/**
 * Specify the target cpu clock speed of your platform by overriding this file.
 *
 * Be aware that tinyos relies on binary 4Mhz, that is 4096000 Hz.  Some
 * platforms have an external high frequency oscilator to generate the SMCLK
 * (e.g. eyesIFX, and possibly future ZigBee compliant nodes). These
 * oscillators provide metric frequencies, but may not run in power down
 * modes. Here, we need to switch the SMCLK source, which is easier if
 * the external and thd DCO source frequency are the same.
 * 
 * @author: Andreas Koepke (koepke at tkn.tu-berlin.de)
 */


#ifndef MS430DCOSPEC_H
#define MS430DCOSPEC_H

#define TARGET_DCO_HZ 4096000 // the cpu clock rate in Hz

#endif

Index: Msp430ClockP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430ClockP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430ClockP.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430ClockP.nc	5 Apr 2007 05:53:52 -0000	1.5
***************
*** 25,28 ****
--- 25,30 ----
   */
  
+ #include <Msp430DcoSpec.h>
+ 
  #include "Msp430Timer.h"
  
***************
*** 43,49 ****
    {
      ACLK_CALIB_PERIOD = 8,
!     ACLK_KHZ = 32,
!     TARGET_DCO_KHZ = 4096, // prescribe the cpu clock rate in kHz
!     TARGET_DCO_DELTA = (TARGET_DCO_KHZ / ACLK_KHZ) * ACLK_CALIB_PERIOD,
    };
  
--- 45,50 ----
    {
      ACLK_CALIB_PERIOD = 8,
!     ACLK_HZ = 32768U,
!     TARGET_DCO_DELTA = (TARGET_DCO_HZ / ACLK_HZ) * ACLK_CALIB_PERIOD,
    };