[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/adc12 Msp430Adc12ClientAutoDMA_RVGC.nc, 1.7, 1.8 Msp430Adc12ConfAlertC.nc, 1.1, 1.2 Msp430Adc12ClientAutoDMAC.nc, 1.6, 1.7 Msp430Adc12ClientAutoRVGC.nc, 1.7, 1.8 Msp430Adc12ClientC.nc, 1.5, 1.6
Razvan Musaloiu-E.
razvanm at users.sourceforge.net
Tue Jun 10 17:42:45 PDT 2008
Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9551/chips/msp430/adc12
Modified Files:
Msp430Adc12ClientAutoDMA_RVGC.nc Msp430Adc12ConfAlertC.nc
Msp430Adc12ClientAutoDMAC.nc Msp430Adc12ClientAutoRVGC.nc
Msp430Adc12ClientC.nc
Log Message:
Convert to Unix-style line terminators.
Index: Msp430Adc12ClientAutoDMA_RVGC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ClientAutoDMA_RVGC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Msp430Adc12ClientAutoDMA_RVGC.nc 7 Apr 2008 09:41:55 -0000 1.7
--- Msp430Adc12ClientAutoDMA_RVGC.nc 11 Jun 2008 00:42:13 -0000 1.8
***************
*** 1,74 ****
! /*
! * 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$ $Date$ @author: Jan Hauer
! * <hauer at tkn.tu-berlin.de>
! * ========================================================================
! */
!
!
! /**
! * This component virtualizes access to the HAL of the MSP430 ADC12. ADC
! * conversion results are copied using DMA and reference voltage is enabled as
! * required by the configuration.
! *
! * @author Jan Hauer
! *
! * @see Please refer to the README.txt and TEP 101 for more information about
! * this component and its intended use.
! */
! #include <Msp430Adc12.h>
! generic configuration Msp430Adc12ClientAutoDMA_RVGC()
! {
! provides {
! interface Resource;
! interface Msp430Adc12SingleChannel;
! interface Msp430Adc12Overflow;
! }
! uses interface AdcConfigure<const msp430adc12_channel_config_t*>;
! } implementation {
! components Msp430Adc12P, Msp430RefVoltArbiterP, Msp430Adc12DMAWireC;
!
! enum {
! ID = unique(MSP430ADC12_RESOURCE),
! };
! Resource = Msp430RefVoltArbiterP.ClientResource[ID];
! Msp430Adc12Overflow = Msp430Adc12P.Overflow[ID];
!
! Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];
!
! components new Msp430Adc12ConfAlertC();
! AdcConfigure = Msp430Adc12ConfAlertC.ConfUp;
! Msp430RefVoltArbiterP.Config[ID] -> Msp430Adc12ConfAlertC.ConfSub;
!
! components Msp430DmaC, Msp430Adc12DMAP;
!
! Msp430Adc12SingleChannel = Msp430Adc12DMAP.SingleChannel[ID];
!
! Msp430Adc12DMAP.SubSingleChannel[ID] -> Msp430Adc12P.SingleChannel[ID];
! Msp430Adc12DMAP.AsyncAdcControl[ID] -> Msp430Adc12P.DMAExtension[ID];
! }
--- 1,74 ----
! /*
! * 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$ $Date$ @author: Jan Hauer
! * <hauer at tkn.tu-berlin.de>
! * ========================================================================
! */
!
!
! /**
! * This component virtualizes access to the HAL of the MSP430 ADC12. ADC
! * conversion results are copied using DMA and reference voltage is enabled as
! * required by the configuration.
! *
! * @author Jan Hauer
! *
! * @see Please refer to the README.txt and TEP 101 for more information about
! * this component and its intended use.
! */
! #include <Msp430Adc12.h>
! generic configuration Msp430Adc12ClientAutoDMA_RVGC()
! {
! provides {
! interface Resource;
! interface Msp430Adc12SingleChannel;
! interface Msp430Adc12Overflow;
! }
! uses interface AdcConfigure<const msp430adc12_channel_config_t*>;
! } implementation {
! components Msp430Adc12P, Msp430RefVoltArbiterP, Msp430Adc12DMAWireC;
!
! enum {
! ID = unique(MSP430ADC12_RESOURCE),
! };
! Resource = Msp430RefVoltArbiterP.ClientResource[ID];
! Msp430Adc12Overflow = Msp430Adc12P.Overflow[ID];
!
! Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];
!
! components new Msp430Adc12ConfAlertC();
! AdcConfigure = Msp430Adc12ConfAlertC.ConfUp;
! Msp430RefVoltArbiterP.Config[ID] -> Msp430Adc12ConfAlertC.ConfSub;
!
! components Msp430DmaC, Msp430Adc12DMAP;
!
! Msp430Adc12SingleChannel = Msp430Adc12DMAP.SingleChannel[ID];
!
! Msp430Adc12DMAP.SubSingleChannel[ID] -> Msp430Adc12P.SingleChannel[ID];
! Msp430Adc12DMAP.AsyncAdcControl[ID] -> Msp430Adc12P.DMAExtension[ID];
! }
Index: Msp430Adc12ConfAlertC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ConfAlertC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Msp430Adc12ConfAlertC.nc 25 Jun 2007 13:44:49 -0000 1.1
--- Msp430Adc12ConfAlertC.nc 11 Jun 2008 00:42:13 -0000 1.2
***************
*** 1,51 ****
! /*
! * 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$ $Date$ @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();
! }
! }
--- 1,51 ----
! /*
! * 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$ $Date$ @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: Msp430Adc12ClientAutoDMAC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ClientAutoDMAC.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Msp430Adc12ClientAutoDMAC.nc 7 Apr 2008 09:41:55 -0000 1.6
--- Msp430Adc12ClientAutoDMAC.nc 11 Jun 2008 00:42:13 -0000 1.7
***************
*** 1,66 ****
! /*
! * 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$
! * $Date$
! * @author: Jan Hauer <hauer at tkn.tu-berlin.de>
! * ========================================================================
! */
!
! /**
! * This component virtualizes access to the HAL of the MSP430 ADC12. ADC
! * conversion results are copied using DMA.
! *
! * @author Jan Hauer
! *
! * @see Please refer to the README.txt and TEP 101 for more information about
! * this component and its intended use.
! */
! #include <Msp430Adc12.h>
! generic configuration Msp430Adc12ClientAutoDMAC()
! {
! provides {
! interface Resource;
! interface Msp430Adc12SingleChannel;
! interface Msp430Adc12Overflow;
! }
! } implementation {
! components Msp430DmaC, Msp430Adc12DMAP, Msp430Adc12P, Msp430Adc12DMAWireC;
!
! enum {
! ID = unique(MSP430ADC12_RESOURCE),
! };
! Resource = Msp430Adc12P.Resource[ID];
! Msp430Adc12SingleChannel = Msp430Adc12DMAP.SingleChannel[ID];
! Msp430Adc12Overflow = Msp430Adc12P.Overflow[ID];
!
! Msp430Adc12DMAP.SubSingleChannel[ID] -> Msp430Adc12P.SingleChannel[ID];
! Msp430Adc12DMAP.AsyncAdcControl[ID] -> Msp430Adc12P.DMAExtension[ID];
!
! }
--- 1,66 ----
! /*
! * 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$
! * $Date$
! * @author: Jan Hauer <hauer at tkn.tu-berlin.de>
! * ========================================================================
! */
!
! /**
! * This component virtualizes access to the HAL of the MSP430 ADC12. ADC
! * conversion results are copied using DMA.
! *
! * @author Jan Hauer
! *
! * @see Please refer to the README.txt and TEP 101 for more information about
! * this component and its intended use.
! */
! #include <Msp430Adc12.h>
! generic configuration Msp430Adc12ClientAutoDMAC()
! {
! provides {
! interface Resource;
! interface Msp430Adc12SingleChannel;
! interface Msp430Adc12Overflow;
! }
! } implementation {
! components Msp430DmaC, Msp430Adc12DMAP, Msp430Adc12P, Msp430Adc12DMAWireC;
!
! enum {
! ID = unique(MSP430ADC12_RESOURCE),
! };
! Resource = Msp430Adc12P.Resource[ID];
! Msp430Adc12SingleChannel = Msp430Adc12DMAP.SingleChannel[ID];
! Msp430Adc12Overflow = Msp430Adc12P.Overflow[ID];
!
! Msp430Adc12DMAP.SubSingleChannel[ID] -> Msp430Adc12P.SingleChannel[ID];
! Msp430Adc12DMAP.AsyncAdcControl[ID] -> Msp430Adc12P.DMAExtension[ID];
!
! }
Index: Msp430Adc12ClientAutoRVGC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ClientAutoRVGC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Msp430Adc12ClientAutoRVGC.nc 7 Apr 2008 09:41:55 -0000 1.7
--- Msp430Adc12ClientAutoRVGC.nc 11 Jun 2008 00:42:13 -0000 1.8
***************
*** 1,68 ****
! /*
! * 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$ $Date$ @author: Jan Hauer
! * <hauer at tkn.tu-berlin.de>
! * ========================================================================
! */
!
! /**
! * This component virtualizes access to the HAL of the MSP430 ADC12.
! * Reference voltage is enabled automatically as required by the configuration.
! *
! * @author Jan Hauer
! *
! * @see Please refer to the README.txt and TEP 101 for more information about
! * this component and its intended use.
! */
! #include <Msp430Adc12.h>
! generic configuration Msp430Adc12ClientAutoRVGC()
! {
! provides {
! interface Resource;
! interface Msp430Adc12SingleChannel;
! interface Msp430Adc12MultiChannel;
! interface Msp430Adc12Overflow;
! }
! uses interface AdcConfigure<const msp430adc12_channel_config_t*>;
! } implementation {
! components Msp430Adc12P, Msp430RefVoltArbiterP;
!
! enum {
! ID = unique(MSP430ADC12_RESOURCE),
! };
! Resource = Msp430RefVoltArbiterP.ClientResource[ID];
! Msp430Adc12SingleChannel = Msp430Adc12P.SingleChannel[ID];
! Msp430Adc12MultiChannel = Msp430Adc12P.MultiChannel[ID];
! Msp430Adc12Overflow = Msp430Adc12P.Overflow[ID];
!
! Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];
!
! components new Msp430Adc12ConfAlertC();
! AdcConfigure = Msp430Adc12ConfAlertC.ConfUp;
! Msp430RefVoltArbiterP.Config[ID] -> Msp430Adc12ConfAlertC.ConfSub;
! }
--- 1,68 ----
! /*
! * 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$ $Date$ @author: Jan Hauer
! * <hauer at tkn.tu-berlin.de>
! * ========================================================================
! */
!
! /**
! * This component virtualizes access to the HAL of the MSP430 ADC12.
! * Reference voltage is enabled automatically as required by the configuration.
! *
! * @author Jan Hauer
! *
! * @see Please refer to the README.txt and TEP 101 for more information about
! * this component and its intended use.
! */
! #include <Msp430Adc12.h>
! generic configuration Msp430Adc12ClientAutoRVGC()
! {
! provides {
! interface Resource;
! interface Msp430Adc12SingleChannel;
! interface Msp430Adc12MultiChannel;
! interface Msp430Adc12Overflow;
! }
! uses interface AdcConfigure<const msp430adc12_channel_config_t*>;
! } implementation {
! components Msp430Adc12P, Msp430RefVoltArbiterP;
!
! enum {
! ID = unique(MSP430ADC12_RESOURCE),
! };
! Resource = Msp430RefVoltArbiterP.ClientResource[ID];
! Msp430Adc12SingleChannel = Msp430Adc12P.SingleChannel[ID];
! Msp430Adc12MultiChannel = Msp430Adc12P.MultiChannel[ID];
! Msp430Adc12Overflow = Msp430Adc12P.Overflow[ID];
!
! Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];
!
! components new Msp430Adc12ConfAlertC();
! AdcConfigure = Msp430Adc12ConfAlertC.ConfUp;
! Msp430RefVoltArbiterP.Config[ID] -> Msp430Adc12ConfAlertC.ConfSub;
! }
Index: Msp430Adc12ClientC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ClientC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430Adc12ClientC.nc 29 May 2007 16:19:20 -0000 1.5
--- Msp430Adc12ClientC.nc 11 Jun 2008 00:42:13 -0000 1.6
***************
*** 1,63 ****
! /*
! * 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$
! * $Date$
! * @author: Jan Hauer <hauer at tkn.tu-berlin.de>
! * ========================================================================
! */
!
! /**
! * This component virtualizes access to the HAL of the MSP430 ADC12.
! *
! * @author Jan Hauer
! *
! * @see Please refer to the README.txt and TEP 101 for more information about
! * this component and its intended use.
! */
! #include <Msp430Adc12.h>
! generic configuration Msp430Adc12ClientC()
! {
! provides {
! interface Resource;
! interface Msp430Adc12SingleChannel;
! interface Msp430Adc12MultiChannel;
! interface Msp430Adc12Overflow;
! }
! } implementation {
! components Msp430Adc12P;
!
! enum {
! ID = unique(MSP430ADC12_RESOURCE),
! };
! Resource = Msp430Adc12P.Resource[ID];
! Msp430Adc12SingleChannel = Msp430Adc12P.SingleChannel[ID];
! Msp430Adc12MultiChannel = Msp430Adc12P.MultiChannel[ID];
! Msp430Adc12Overflow = Msp430Adc12P.Overflow[ID];
! }
--- 1,63 ----
! /*
! * 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$
! * $Date$
! * @author: Jan Hauer <hauer at tkn.tu-berlin.de>
! * ========================================================================
! */
!
! /**
! * This component virtualizes access to the HAL of the MSP430 ADC12.
! *
! * @author Jan Hauer
! *
! * @see Please refer to the README.txt and TEP 101 for more information about
! * this component and its intended use.
! */
! #include <Msp430Adc12.h>
! generic configuration Msp430Adc12ClientC()
! {
! provides {
! interface Resource;
! interface Msp430Adc12SingleChannel;
! interface Msp430Adc12MultiChannel;
! interface Msp430Adc12Overflow;
! }
! } implementation {
! components Msp430Adc12P;
!
! enum {
! ID = unique(MSP430ADC12_RESOURCE),
! };
! Resource = Msp430Adc12P.Resource[ID];
! Msp430Adc12SingleChannel = Msp430Adc12P.SingleChannel[ID];
! Msp430Adc12MultiChannel = Msp430Adc12P.MultiChannel[ID];
! Msp430Adc12Overflow = Msp430Adc12P.Overflow[ID];
! }
More information about the Tinyos-2-commits
mailing list