From: R. Steve McKown Date: Fri, 23 Apr 2010 18:24:41 +0000 (-0600) Subject: Fix tmicore's PlatformSerialC to provide the conventional set of interfaces. X-Git-Tag: release/2.1.0-4.1~3 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=c6f9fe58c7f6e9dc9849777fb0a2dcf96b7d9177 Fix tmicore's PlatformSerialC to provide the conventional set of interfaces. --- diff --git a/tos/platforms/tmicore/PlatformSerialC.nc b/tos/platforms/tmicore/PlatformSerialC.nc index 35b1d8c6..06cb3241 100644 --- a/tos/platforms/tmicore/PlatformSerialC.nc +++ b/tos/platforms/tmicore/PlatformSerialC.nc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Titanium Mirror, Inc. + * Copyright (c) 2008-2010, Titanium Mirror, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,16 +32,19 @@ */ configuration PlatformSerialC { - provides interface Resource; + provides interface StdControl; provides interface UartStream; provides interface UartByte; } implementation { components new Msp430UartA1C() as UartC; - Resource = UartC; UartStream = UartC; UartByte = UartC; + components PlatformSerialP; + StdControl = PlatformSerialP; + PlatformSerialP.Resource -> UartC; + #if 0 /* If you want to change the configuration... */ components SomeConfigurationComponentC as ConfigC; UartC.AsyncConfigure -> ConfigC; diff --git a/tos/platforms/tmicore/PlatformSerialP.nc b/tos/platforms/tmicore/PlatformSerialP.nc new file mode 100644 index 00000000..ae0fb9f2 --- /dev/null +++ b/tos/platforms/tmicore/PlatformSerialP.nc @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2010, Titanium Mirror, Inc. + * 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. + */ + +/** + * @author R. Steve McKown + */ + +module PlatformSerialP { + provides interface StdControl; + uses interface Resource; +} +implementation { + command error_t StdControl.start() + { + return call Resource.immediateRequest(); + } + + command error_t StdControl.stop() + { + call Resource.release(); + return SUCCESS; + } + + event void Resource.granted() {} +}