[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/adc12 Msp430Adc12ConfAlertC.nc, NONE, 1.1 Msp430Adc12ClientAutoRVGC.nc, 1.5, 1.6 Msp430Adc12ClientAutoDMA_RVGC.nc, 1.5, 1.6

[Jan-Hinrich Hauer]

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

Modified Files:
	Msp430Adc12ClientAutoRVGC.nc Msp430Adc12ClientAutoDMA_RVGC.nc 
Added Files:
	Msp430Adc12ConfAlertC.nc 
Log Message:
Added a generic that generates a nesC warning if someone wired to RefVolt arbiter
but forgot to wire the AdcConfigure interface (the component does not generate 
any code).


--- NEW FILE: Msp430Adc12ConfAlertC.nc ---
/* 
 * Copyright (c) 2006, 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 -------------------------------------------------------------
 * $Revision: 1.1 $ $Date: 2007/06/25 13:44:49 $ @author: Jan Hauer
 * <hauer at tkn.tu-berlin.de>
 * ========================================================================
 */
 
/** 
 * The only purpose of this component is to generate a nesC warning
 * if someone has wired to Msp430Adc12ClientAutoRVGC or 
 * Msp430Adc12ClientAutoDMA_RVGC and forgotten to wire to AdcConfigure.
 * (nesC optimizes all of its code away).
 *
 * @author: Jan Hauer
 */
#include <Msp430Adc12.h> 
generic module Msp430Adc12ConfAlertC()
{
  provides interface AdcConfigure<const msp430adc12_channel_config_t*> as ConfSub;
  uses interface AdcConfigure<const msp430adc12_channel_config_t*> as ConfUp;
} implementation {
  async command const msp430adc12_channel_config_t* ConfSub.getConfiguration()
  {
    return call ConfUp.getConfiguration();
  }
}

Index: Msp430Adc12ClientAutoRVGC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ClientAutoRVGC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430Adc12ClientAutoRVGC.nc	29 May 2007 16:19:20 -0000	1.5
--- Msp430Adc12ClientAutoRVGC.nc	25 Jun 2007 13:44:49 -0000	1.6
***************
*** 46,49 ****
--- 46,50 ----
      interface Resource;
      interface Msp430Adc12SingleChannel;
+     interface Msp430Adc12MultiChannel;
    }
    uses interface AdcConfigure<const msp430adc12_channel_config_t*>;
***************
*** 56,61 ****
    Resource = Msp430RefVoltArbiterP.ClientResource[ID];
    Msp430Adc12SingleChannel = Msp430Adc12P.SingleChannel[ID];
    
    Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];
!   AdcConfigure = Msp430RefVoltArbiterP.Config[ID]; 
  }
--- 57,66 ----
    Resource = Msp430RefVoltArbiterP.ClientResource[ID];
    Msp430Adc12SingleChannel = Msp430Adc12P.SingleChannel[ID];
+   Msp430Adc12MultiChannel = Msp430Adc12P.MultiChannel[ID];
    
    Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];
! 
!   components new Msp430Adc12ConfAlertC();
!   AdcConfigure = Msp430Adc12ConfAlertC.ConfUp;
!   Msp430RefVoltArbiterP.Config[ID] -> Msp430Adc12ConfAlertC.ConfSub; 
  }

Index: Msp430Adc12ClientAutoDMA_RVGC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ClientAutoDMA_RVGC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430Adc12ClientAutoDMA_RVGC.nc	29 May 2007 16:19:20 -0000	1.5
--- Msp430Adc12ClientAutoDMA_RVGC.nc	25 Jun 2007 13:44:49 -0000	1.6
***************
*** 59,63 ****
    
    Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];
!   AdcConfigure = Msp430RefVoltArbiterP.Config[ID]; 
  
    components Msp430DmaC, Msp430Adc12DMAP;
--- 59,66 ----
    
    Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];
! 
!   components new Msp430Adc12ConfAlertC();
!   AdcConfigure = Msp430Adc12ConfAlertC.ConfUp;
!   Msp430RefVoltArbiterP.Config[ID] -> Msp430Adc12ConfAlertC.ConfSub;   
  
    components Msp430DmaC, Msp430Adc12DMAP;