From 8f8393aadcc769f0ea0379d9b2960a899fd474d3 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Mon, 14 Jun 2010 07:34:36 +0000
Subject: [PATCH] Moved ctimer.[ch] from their old and illogical location in
 core/net/rime to a more appropriate place in core/sys

---
 Makefile.include                   | 8 +++++---
 core/contiki.h                     | 3 ++-
 core/net/mac/csma.c                | 5 +++--
 core/net/mac/phase.c               | 6 +++---
 core/net/rime.h                    | 3 +--
 core/net/rime/Makefile.rime        | 2 +-
 core/net/rime/collect-neighbor.c   | 4 ++--
 core/net/rime/ipolite.h            | 5 +++--
 core/net/rime/neighbor-discovery.h | 3 +--
 core/net/rime/netflood.h           | 4 +---
 core/net/rime/packetqueue.c        | 4 ++--
 core/net/rime/packetqueue.h        | 4 +++-
 core/net/rime/polite.h             | 3 +--
 core/net/rime/route.c              | 4 ++--
 core/net/rime/stbroadcast.h        | 5 +++--
 core/net/rime/stunicast.h          | 4 ++--
 core/net/rime/trickle.h            | 5 +++--
 core/{net/rime => sys}/ctimer.c    | 5 ++---
 core/{net/rime => sys}/ctimer.h    | 2 +-
 19 files changed, 41 insertions(+), 38 deletions(-)
 rename core/{net/rime => sys}/ctimer.c (97%)
 rename core/{net/rime => sys}/ctimer.h (98%)

diff --git a/Makefile.include b/Makefile.include
index 52c811a8b..526fdf2b3 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -50,7 +50,7 @@ include $(CONTIKI)/core/net/mac/Makefile.mac
 SYSTEM  = process.c procinit.c autostart.c elfloader.c profile.c \
           timetable.c timetable-aggregate.c compower.c serial-line.c
 THREADS = mt.c
-LIBS    = memb.c mmem.c timer.c list.c etimer.c energest.c rtimer.c stimer.c \
+LIBS    = memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c stimer.c \
           print-stats.c ifft.c crc16.c random.c checkpoint.c ringbuf.c
 DEV     = nullradio.c
 NET     = netstack.c uip-debug.c
@@ -93,10 +93,12 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFI
 
 ifdef APPS
   APPDIRS += ${wildcard ${addprefix $(CONTIKI)/apps/, $(APPS)} \
-                ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)}}
+                ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)} \
+		${addprefix , $(APPS)}}
   APPINCLUDES = ${foreach APP, $(APPS), ${wildcard \
                  $(CONTIKI)/apps/$(APP)/Makefile.$(APP) \
-                 $(CONTIKI)/platform/$(TARGET)/apps/$(APP)/Makefile.$(APP)}}
+                 $(CONTIKI)/platform/$(TARGET)/apps/$(APP)/Makefile.$(APP) \
+	         $(APP)/Makefile.$(APP)}}
   -include $(APPINCLUDES)
   APP_SOURCES = ${foreach APP, $(APPS), $($(APP)_src)}
   DSC_SOURCES = ${foreach APP, $(APPS), $($(APP)_dsc)}
diff --git a/core/contiki.h b/core/contiki.h
index cf3128095..84b3ba231 100644
--- a/core/contiki.h
+++ b/core/contiki.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki.h,v 1.5 2008/07/03 23:36:30 adamdunkels Exp $
+ * $Id: contiki.h,v 1.6 2010/06/14 07:34:36 adamdunkels Exp $
  */
 #ifndef __CONTIKI_H__
 #define __CONTIKI_H__
@@ -42,6 +42,7 @@
 #include "sys/autostart.h"
 
 #include "sys/timer.h"
+#include "sys/ctimer.h"
 #include "sys/etimer.h"
 #include "sys/rtimer.h"
 
diff --git a/core/net/mac/csma.c b/core/net/mac/csma.c
index 76e059146..7e537b128 100644
--- a/core/net/mac/csma.c
+++ b/core/net/mac/csma.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: csma.c,v 1.16 2010/04/08 09:33:37 adamdunkels Exp $
+ * $Id: csma.c,v 1.17 2010/06/14 07:34:36 adamdunkels Exp $
  */
 
 /**
@@ -41,7 +41,8 @@
 #include "net/mac/csma.h"
 #include "net/rime/packetbuf.h"
 #include "net/rime/queuebuf.h"
-#include "net/rime/ctimer.h"
+
+#include "sys/ctimer.h"
 
 #include "lib/random.h"
 
diff --git a/core/net/mac/phase.c b/core/net/mac/phase.c
index ab4f219ee..d5b384c66 100644
--- a/core/net/mac/phase.c
+++ b/core/net/mac/phase.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: phase.c,v 1.11 2010/04/27 12:56:35 fros4943 Exp $
+ * $Id: phase.c,v 1.12 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -42,7 +42,7 @@
 #include "net/rime/packetbuf.h"
 #include "sys/clock.h"
 #include "lib/memb.h"
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 #include "net/rime/queuebuf.h"
 #include "dev/watchdog.h"
 #include "dev/leds.h"
@@ -57,7 +57,7 @@ struct phase_queueitem {
 #define PHASE_DEFER_THRESHOLD 1
 #define PHASE_QUEUESIZE       8
 
-#define MAX_NOACKS            2
+#define MAX_NOACKS            3
 
 MEMB(queued_packets_memb, struct phase_queueitem, PHASE_QUEUESIZE);
 
diff --git a/core/net/rime.h b/core/net/rime.h
index d52721094..bc7d68c1a 100644
--- a/core/net/rime.h
+++ b/core/net/rime.h
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rime.h,v 1.28 2010/03/19 13:20:40 adamdunkels Exp $
+ * $Id: rime.h,v 1.29 2010/06/14 07:34:36 adamdunkels Exp $
  */
 
 /**
@@ -48,7 +48,6 @@
 
 #include "net/rime/announcement.h"
 #include "net/rime/collect.h"
-#include "net/rime/ctimer.h"
 #include "net/rime/ipolite.h"
 #include "net/rime/mesh.h"
 #include "net/rime/multihop.h"
diff --git a/core/net/rime/Makefile.rime b/core/net/rime/Makefile.rime
index 60f72da2e..2ce3a622f 100644
--- a/core/net/rime/Makefile.rime
+++ b/core/net/rime/Makefile.rime
@@ -1,5 +1,5 @@
 RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c
-RIME_BASE      = packetbuf.c queuebuf.c rimeaddr.c ctimer.c rime.c timesynch.c \
+RIME_BASE      = packetbuf.c queuebuf.c rimeaddr.c rime.c timesynch.c \
                  rimestats.c announcement.c polite-announcement.c packetqueue.c \
                  broadcast-announcement.c
 RIME_SINGLEHOP = broadcast.c stbroadcast.c unicast.c stunicast.c \
diff --git a/core/net/rime/collect-neighbor.c b/core/net/rime/collect-neighbor.c
index b09ca7314..cc47a8605 100644
--- a/core/net/rime/collect-neighbor.c
+++ b/core/net/rime/collect-neighbor.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect-neighbor.c,v 1.1 2010/03/19 13:17:00 adamdunkels Exp $
+ * $Id: collect-neighbor.c,v 1.2 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -49,8 +49,8 @@
 #include "contiki.h"
 #include "lib/memb.h"
 #include "lib/list.h"
+
 #include "net/rime/collect-neighbor.h"
-#include "net/rime/ctimer.h"
 #include "net/rime/collect.h"
 
 #ifdef COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS
diff --git a/core/net/rime/ipolite.h b/core/net/rime/ipolite.h
index e5496f652..3cb4c2635 100644
--- a/core/net/rime/ipolite.h
+++ b/core/net/rime/ipolite.h
@@ -81,7 +81,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ipolite.h,v 1.10 2010/01/25 13:54:06 adamdunkels Exp $
+ * $Id: ipolite.h,v 1.11 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -94,8 +94,9 @@
 #ifndef __IPOLITE_H__
 #define __IPOLITE_H__
 
+#include "sys/ctimer.h"
+
 #include "net/rime/broadcast.h"
-#include "net/rime/ctimer.h"
 #include "net/rime/queuebuf.h"
 
 struct ipolite_conn;
diff --git a/core/net/rime/neighbor-discovery.h b/core/net/rime/neighbor-discovery.h
index 82e0d1cfa..ac2c2e238 100644
--- a/core/net/rime/neighbor-discovery.h
+++ b/core/net/rime/neighbor-discovery.h
@@ -47,7 +47,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: neighbor-discovery.h,v 1.10 2010/02/23 18:36:50 adamdunkels Exp $
+ * $Id: neighbor-discovery.h,v 1.11 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -61,7 +61,6 @@
 #define __NEIGHBOR_DISCOVERY_H__
 
 #include "net/rime/broadcast.h"
-#include "net/rime/ctimer.h"
 
 struct neighbor_discovery_conn;
 
diff --git a/core/net/rime/netflood.h b/core/net/rime/netflood.h
index 60e503d49..de9c722ca 100644
--- a/core/net/rime/netflood.h
+++ b/core/net/rime/netflood.h
@@ -62,7 +62,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: netflood.h,v 1.5 2009/11/08 19:40:17 adamdunkels Exp $
+ * $Id: netflood.h,v 1.6 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -75,8 +75,6 @@
 #ifndef __NETFLOOD_H__
 #define __NETFLOOD_H__
 
-
-#include "net/rime/ctimer.h"
 #include "net/rime/queuebuf.h"
 #include "net/rime/ipolite.h"
 
diff --git a/core/net/rime/packetqueue.c b/core/net/rime/packetqueue.c
index e6eda223f..eacdd8b61 100644
--- a/core/net/rime/packetqueue.c
+++ b/core/net/rime/packetqueue.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetqueue.c,v 1.2 2010/02/28 09:20:32 adamdunkels Exp $
+ * $Id: packetqueue.c,v 1.3 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -42,7 +42,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 #include "net/rime/packetqueue.h"
 
 /*---------------------------------------------------------------------------*/
diff --git a/core/net/rime/packetqueue.h b/core/net/rime/packetqueue.h
index 53996ac8a..fcef63a0e 100644
--- a/core/net/rime/packetqueue.h
+++ b/core/net/rime/packetqueue.h
@@ -41,7 +41,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetqueue.h,v 1.4 2010/02/28 09:20:32 adamdunkels Exp $
+ * $Id: packetqueue.h,v 1.5 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -57,6 +57,8 @@
 #include "lib/list.h"
 #include "lib/memb.h"
 
+#include "sys/ctimer.h"
+
 #include "net/rime/packetbuf.h"
 #include "net/rime/queuebuf.h"
 
diff --git a/core/net/rime/polite.h b/core/net/rime/polite.h
index c3bc3f988..d0f7ec49d 100644
--- a/core/net/rime/polite.h
+++ b/core/net/rime/polite.h
@@ -81,7 +81,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: polite.h,v 1.7 2009/03/12 21:58:21 adamdunkels Exp $
+ * $Id: polite.h,v 1.8 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -96,7 +96,6 @@
 
 #include "net/rime/abc.h"
 #include "net/rime/queuebuf.h"
-#include "net/rime/ctimer.h"
 
 struct polite_conn;
 
diff --git a/core/net/rime/route.c b/core/net/rime/route.c
index 3a25ddb5e..4ab81289d 100644
--- a/core/net/rime/route.c
+++ b/core/net/rime/route.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route.c,v 1.16 2010/02/03 01:18:24 adamdunkels Exp $
+ * $Id: route.c,v 1.17 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -47,7 +47,7 @@
 
 #include "lib/list.h"
 #include "lib/memb.h"
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 #include "net/rime/route.h"
 #include "contiki-conf.h"
 
diff --git a/core/net/rime/stbroadcast.h b/core/net/rime/stbroadcast.h
index 5e27a06c6..eed7d7795 100644
--- a/core/net/rime/stbroadcast.h
+++ b/core/net/rime/stbroadcast.h
@@ -48,7 +48,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stbroadcast.h,v 1.2 2009/05/26 13:58:53 nvt-se Exp $
+ * $Id: stbroadcast.h,v 1.3 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -61,8 +61,9 @@
 #ifndef __STBROADCAST_H__
 #define __STBROADCAST_H__
 
+#include "sys/ctimer.h"
+
 #include "net/rime/broadcast.h"
-#include "net/rime/ctimer.h"
 #include "net/rime/queuebuf.h"
 
 struct stbroadcast_conn;
diff --git a/core/net/rime/stunicast.h b/core/net/rime/stunicast.h
index ca9b539a9..f85fb6c31 100644
--- a/core/net/rime/stunicast.h
+++ b/core/net/rime/stunicast.h
@@ -60,7 +60,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stunicast.h,v 1.5 2010/02/23 18:38:05 adamdunkels Exp $
+ * $Id: stunicast.h,v 1.6 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -73,8 +73,8 @@
 #ifndef __STUNICAST_H__
 #define __STUNICAST_H__
 
+#include "sys/ctimer.h"
 #include "net/rime/unicast.h"
-#include "net/rime/ctimer.h"
 #include "net/rime/queuebuf.h"
 
 struct stunicast_conn;
diff --git a/core/net/rime/trickle.h b/core/net/rime/trickle.h
index 25c404f3c..73b748b3a 100644
--- a/core/net/rime/trickle.h
+++ b/core/net/rime/trickle.h
@@ -45,7 +45,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: trickle.h,v 1.11 2009/04/06 21:20:35 adamdunkels Exp $
+ * $Id: trickle.h,v 1.12 2010/06/14 07:34:37 adamdunkels Exp $
  */
 
 /**
@@ -58,8 +58,9 @@
 #ifndef __TRICKLE_H__
 #define __TRICKLE_H__
 
+#include "sys/ctimer.h"
+
 #include "net/rime/broadcast.h"
-#include "net/rime/ctimer.h"
 #include "net/rime/queuebuf.h"
 
 #define TRICKLE_ATTRIBUTES  { PACKETBUF_ATTR_EPACKET_ID, PACKETBUF_ATTR_BIT * 8 },\
diff --git a/core/net/rime/ctimer.c b/core/sys/ctimer.c
similarity index 97%
rename from core/net/rime/ctimer.c
rename to core/sys/ctimer.c
index 15e23d678..ffcde952d 100644
--- a/core/net/rime/ctimer.c
+++ b/core/sys/ctimer.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctimer.c,v 1.8 2010/04/09 16:21:07 nvt-se Exp $
+ * $Id: ctimer.c,v 1.1 2010/06/14 07:34:36 adamdunkels Exp $
  */
 
 /**
@@ -43,10 +43,9 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 #include "contiki.h"
 #include "lib/list.h"
-#include "net/rime.h"
 
 LIST(ctimer_list);
 
diff --git a/core/net/rime/ctimer.h b/core/sys/ctimer.h
similarity index 98%
rename from core/net/rime/ctimer.h
rename to core/sys/ctimer.h
index 5e7ce4188..70239c008 100644
--- a/core/net/rime/ctimer.h
+++ b/core/sys/ctimer.h
@@ -42,7 +42,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctimer.h,v 1.4 2009/11/19 18:32:05 nifi Exp $
+ * $Id: ctimer.h,v 1.1 2010/06/14 07:34:36 adamdunkels Exp $
  */
 
 /**