Merge over into the trunk.

[tinyos-2.x.git] / tos / lib / serial / SerialDispatcherC.nc

diff --git a/tos/lib/serial/SerialDispatcherC.nc b/tos/lib/serial/SerialDispatcherC.nc
index 67a5b21348ea5c4f9b9bbfe43a88c396e37ed00e..a8786e6a19791783085fd4c36a8ea7ee083a9799 100644 (file)
--- a/tos/lib/serial/SerialDispatcherC.nc
+++ b/tos/lib/serial/SerialDispatcherC.nc
@@ -1,18 +1,18 @@
 //$Id$
 
-/* "Copyright (c) 2005 The Regents of the University of California.  
+/* "Copyright (c) 2005 The Regents of the University of California.
  * All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without written agreement
  * is hereby granted, provided that the above copyright notice, the following
  * two paragraphs and the author appear in all copies of this software.
- * 
+ *
  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY
  * OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
@@ -46,27 +46,26 @@ configuration SerialDispatcherC {
   }
 }
 implementation {
-  components SerialP, new SerialDispatcherP(), 
-    HdlcTranslateC, 
+  components SerialP, new SerialDispatcherP(),
+    HdlcTranslateC,
     PlatformSerialC;
-  
+
   Send = SerialDispatcherP;
   Receive = SerialDispatcherP;
   SerialPacketInfo = SerialDispatcherP.PacketInfo;
   SplitControl = SerialP;
-  
+
   Init = SerialP;
-  Init = PlatformSerialC;
   Leds = SerialP;
   Leds = SerialDispatcherP;
   Leds = HdlcTranslateC;
 
   SerialDispatcherP.ReceiveBytePacket -> SerialP;
   SerialDispatcherP.SendBytePacket -> SerialP;
-  
+
   SerialP.SerialFrameComm -> HdlcTranslateC;
   SerialP.SerialControl -> PlatformSerialC;
-  
-  HdlcTranslateC.SerialByteComm -> PlatformSerialC;
-  
+
+  HdlcTranslateC.UartStream -> PlatformSerialC;
+
 }