From: sdhsdh <sdhsdh>
Date: Mon, 10 Aug 2009 01:10:51 +0000 (+0000)
Subject: fix compile
X-Git-Tag: rc_6_tinyos_2_1_1~346
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=9aa648fe3a9bac6b0b8327f3a79071bb142e30c7

fix compile
---

diff --git a/apps/IPBaseStation/ResetC.nc b/apps/IPBaseStation/ResetC.nc
new file mode 100644
index 00000000..3684166a
--- /dev/null
+++ b/apps/IPBaseStation/ResetC.nc
@@ -0,0 +1,56 @@
+// $Id$
+
+/*									tab:4
+ * "Copyright (c) 2000-2003 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."
+ *
+ * Copyright (c) 2002-2003 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+
+/* 
+ * Authors:  Wei Hong
+ *           Intel Research Berkeley Lab
+ * Date:     7/15/2002
+ *
+ */
+
+/**
+ * @author Wei Hong
+ * @author Intel Research Berkeley Lab
+ */
+
+includes Reset;
+
+module ResetC
+{
+	provides interface Reset;
+}
+implementation
+{
+	command void Reset.reset()
+	{
+		resetMote();
+	}
+}
diff --git a/apps/TCPEcho/Makefile b/apps/TCPEcho/Makefile
index d9c3d0a4..a8a9101e 100644
--- a/apps/TCPEcho/Makefile
+++ b/apps/TCPEcho/Makefile
@@ -4,7 +4,7 @@ COMPONENT=TCPEchoC
 # BOOTLOADER=tosboot
 
 # radio opts
-CFLAGS += -DCC2420_DEF_CHANNEL=17
+CFLAGS += -DCC2420_DEF_CHANNEL=15
 # CFLAGS += -DCC2420_DEF_RFPOWER=4
 
 
diff --git a/apps/TCPEcho/TCPEchoC.nc b/apps/TCPEcho/TCPEchoC.nc
index 8351bbca..7f9e28fa 100644
--- a/apps/TCPEcho/TCPEchoC.nc
+++ b/apps/TCPEcho/TCPEchoC.nc
@@ -21,7 +21,6 @@
  */
 
 #include <6lowpan.h>
-#include "TestDriver.h"
 
 configuration TCPEchoC {