[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250 ClkDiv.nc, NONE, 1.1 Tda5250RadioP.nc, 1.4, 1.5 Tda5250RadioC.nc, 1.4, 1.5

[akoepke]

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

Modified Files:
	Tda5250RadioP.nc Tda5250RadioC.nc 
Added Files:
	ClkDiv.nc 
Log Message:
expose clock divider of tda5250, add a component that uses this as an input to
SMCLK -- use with caution.


--- NEW FILE: ClkDiv.nc ---
/* -*- 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.
 *
 * $Revision: 1.1 $
 * $Date: 2007/03/10 22:01:58 $
 */

/**
 * This radio provides a clock divider output that can be used to drive 
 * a high frequency clock of an micro processor. 
 * @author: Andreas Koepke <koepke at tkn.tu-berlin.de>
 */

interface ClkDiv {
    /**
     * this event signals that the clkdiv delivers a stable signal
     */
    async event void startDone();

    /**
     * this event signals that the clkdiv will stop to deliver a stable signal
     */
    async event void stopping();

    /**
     * From now on, never switch the clkdiv off -- consumes more energy!
     * This command may take a while until it takes effect.
     */
    // command void alwaysOnMode();

    /**
     * Return to default mode: clkdiv is switched on when the radio demands
     * it, other components will get the start/stop events and hence know what
     * is going on now.
     */
    // command void sporadicMode();
}

Index: Tda5250RadioP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Tda5250RadioP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Tda5250RadioP.nc	12 Dec 2006 18:23:13 -0000	1.4
--- Tda5250RadioP.nc	10 Mar 2007 22:01:58 -0000	1.5
***************
*** 55,58 ****
--- 55,59 ----
          interface RadioByteComm;
          interface ResourceRequested;
+         interface ClkDiv;
      }
      uses {
***************
*** 87,90 ****
--- 88,92 ----
      /**************** Radio Start  *****************/
      task void startDoneTask() {
+         signal ClkDiv.startDone();
          signal SplitControl.startDone(SUCCESS);
      }
***************
*** 136,139 ****
--- 138,143 ----
              case RADIO_MODE_ON_TRANSITION:
                  call HplTda5250Config.reset();
+                 // call HplTda5250Config.SetRFPower(240);
+                 // call HplTda5250Config.SetClockOnDuringPowerDown();
                  call HplTda5250Config.SetRFPower(255);
                  call ConfigResource.release();
***************
*** 142,145 ****
--- 146,150 ----
                  break;
              case RADIO_MODE_OFF_TRANSITION:
+                 signal ClkDiv.stopping();
                  call HplTda5250Config.SetSleepMode();
                  call ConfigResource.release();
***************
*** 148,151 ****
--- 153,157 ----
                  break;
              case RADIO_MODE_SLEEP_TRANSITION:
+                 signal ClkDiv.stopping();
                  call HplTda5250Config.SetSlaveMode();
                  call HplTda5250Config.SetSleepMode();
***************
*** 406,409 ****
--- 412,416 ----
              break;
            case RECEIVER_DELAY :
+               signal ClkDiv.startDone();
              delayTimer = RSSISTABLE_DELAY;
              call DelayTimer.start(TDA5250_RSSI_STABLE_TIME-TDA5250_RECEIVER_SETUP_TIME);
***************
*** 415,418 ****
--- 422,426 ----
              break;
            case TRANSMITTER_DELAY :
+               signal ClkDiv.startDone();
              if (call DataResource.immediateRequest() == SUCCESS) {
                switchDataResource();
***************
*** 444,446 ****
--- 452,458 ----
        default async event void RadioByteComm.txByteReady(error_t error) {
        }
+       default async event void ClkDiv.startDone() {
+       }
+       default async event void ClkDiv.stopping() {
+       }
  }

Index: Tda5250RadioC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Tda5250RadioC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Tda5250RadioC.nc	12 Dec 2006 18:23:13 -0000	1.4
--- Tda5250RadioC.nc	10 Mar 2007 22:01:58 -0000	1.5
***************
*** 47,50 ****
--- 47,51 ----
      interface ResourceRequested;
      interface RadioByteComm;
+     interface ClkDiv;
    }
  }
***************
*** 64,67 ****
--- 65,69 ----
    RadioByteComm = Tda5250RadioP;
    SplitControl = Tda5250RadioP;
+   ClkDiv = Tda5250RadioP;
  
    Tda5250RadioP.DelayTimer -> DelayTimer;