Remove a redundant component. This issue was reported by Roman Lim.

diff --git a/tos/lib/net/Deluge/Crc.nc b/tos/lib/net/Deluge/Crc.nc
deleted file mode 100644 (file)
index 93283aa..0000000
--- a/tos/lib/net/Deluge/Crc.nc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- * "Copyright (c) 2000-2004 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
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
- */
-
-/**
- * @author Jonathan Hui <jwhui@cs.berkeley.edu>
- */
-
-interface Crc
-{
-  command uint16_t crc16(void* COUNT(len) buf, uint8_t len);
-}

diff --git a/tos/lib/net/Deluge/CrcP.nc b/tos/lib/net/Deluge/CrcP.nc
deleted file mode 100644 (file)
index a14a14e..0000000
--- a/tos/lib/net/Deluge/CrcP.nc
+++ /dev/null
@@ -1,48 +0,0 @@
-/* 
- * "Copyright (c) 2000-2004 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
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
- */
-
-/**
- * @author Jonathan Hui <jwhui@cs.berkeley.edu>
- */
-
-#include "crc.h"
-
-module CrcP
-{
-  provides interface Crc;
-}
-
-implementation
-{
-  // From T1 "tos/system/CrcC.nc"
-  command uint16_t Crc.crc16(void* buf, uint8_t len)
-  {
-    uint8_t* tmpBuf = (uint8_t*)buf;
-    uint16_t crc;
-    
-    for (crc = 0; len > 0; len--) {
-      crc = crcByte(crc, *tmpBuf);   // Calculates running CRC
-      tmpBuf++;
-    }
-    
-    return crc;
-  }
-}

diff --git a/tos/lib/net/Deluge/ObjectTransferC.nc b/tos/lib/net/Deluge/ObjectTransferC.nc
index 8e77dc630ca5faa8398d2dffd9a594e64dbfde3a..72b9db5a56d8d9661e93ceaceccbec0b22ed5c51 100644 (file)
--- a/tos/lib/net/Deluge/ObjectTransferC.nc
+++ b/tos/lib/net/Deluge/ObjectTransferC.nc
@@ -40,13 +40,13 @@ configuration ObjectTransferC
 implementation
 {
   components ObjectTransferP, DelugePageTransferC;
-  components CrcP;
+  components CrcC;
   
   ObjectTransfer = ObjectTransferP;
   DelugePageTransferC.BlockRead = BlockRead;
   DelugePageTransferC.BlockWrite = BlockWrite;
   ObjectTransferP.DelugePageTransfer -> DelugePageTransferC.DelugePageTransfer;
-  ObjectTransferP.Crc -> CrcP.Crc;
+  ObjectTransferP.Crc -> CrcC.Crc;
   
   components new AMSenderC(AM_DELUGEADVMSG) as SendAdvMsg, 
              new AMReceiverC(AM_DELUGEADVMSG) as ReceiveAdvMsg,

diff --git a/tos/lib/net/Deluge/extra/NetProgC.nc b/tos/lib/net/Deluge/extra/NetProgC.nc
index 9857964a1b9afd1e05868e9b746b66f99c7fcef4..36fabc7d00dd05b94c65462e9649c0b8985143ab 100644 (file)
--- a/tos/lib/net/Deluge/extra/NetProgC.nc
+++ b/tos/lib/net/Deluge/extra/NetProgC.nc
@@ -40,14 +40,14 @@ configuration NetProgC {
 
 implementation {
 
-  components MainC, InternalFlashC as IFlash, CrcP;
+  components MainC, InternalFlashC as IFlash, CrcC;
   components NetProgM, ReprogramGuardC;
 
   NetProg = NetProgM;
 
   MainC.SoftwareInit -> NetProgM.Init;
   NetProgM.IFlash -> IFlash;
-  NetProgM.Crc -> CrcP;
+  NetProgM.Crc -> CrcC;
   NetProgM.ReprogramGuard -> ReprogramGuardC;
 
   components LedsC;

diff --git a/tos/lib/net/Deluge/extra/iris/NetProgC.nc b/tos/lib/net/Deluge/extra/iris/NetProgC.nc
index 1d785b43ca91bf275aff877239d425bc8f175508..7a508e11ea5d0dc671f17ba12102219b70324cdb 100644 (file)
--- a/tos/lib/net/Deluge/extra/iris/NetProgC.nc
+++ b/tos/lib/net/Deluge/extra/iris/NetProgC.nc
@@ -40,13 +40,13 @@ configuration NetProgC {
 
 implementation {
 
-  components MainC, InternalFlashC as IFlash, CrcP, NetProgM;
+  components MainC, InternalFlashC as IFlash, CrcC, NetProgM;
 
   NetProg = NetProgM;
 
   MainC.SoftwareInit -> NetProgM.Init;
   NetProgM.IFlash -> IFlash;
-  NetProgM.Crc -> CrcP;
+  NetProgM.Crc -> CrcC;
 
   components LedsC;
   NetProgM.Leds -> LedsC;