From eadfe5f3d68e0593b4cfc1730fa0fc65ca029367 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Tue, 23 Feb 2010 18:44:52 +0000
Subject: [PATCH] Enabled 32-bit clock ticks to allow longer timeouts;
 experimentally disabled polite announcements in favour of a non-announcement
 based collect protocol

---
 platform/sky/contiki-conf.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index f068871cd..89428d2e2 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,5 +1,5 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.72 2010/02/18 21:48:39 adamdunkels Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.73 2010/02/23 18:44:52 adamdunkels Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
@@ -31,12 +31,17 @@
 
 #define CC2420_CONF_AUTOACK              1
 #define MAC_CONF_CHANNEL_CHECK_RATE      8
-#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
+#define COLLECT_CONF_ANNOUNCEMENTS       0
+#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1
 #define CXMAC_CONF_ANNOUNCEMENTS         0
 #define XMAC_CONF_ANNOUNCEMENTS          0
 
+#define CONTIKIMAC_CONF_COMPOWER         1
 #define XMAC_CONF_COMPOWER               1
 #define CXMAC_CONF_COMPOWER              1
+
+
+
 #endif /* WITH_UIP6 */
 
 #define QUEUEBUF_CONF_NUM          16
@@ -93,7 +98,7 @@
 #define F_CPU 3900000uL /*2457600uL*/
 
 /* Our clock resolution, this is the same as Unix HZ. */
-#define CLOCK_CONF_SECOND 128
+#define CLOCK_CONF_SECOND 128L
 
 #define BAUD2UBR(baud) ((F_CPU/baud))
 
@@ -169,7 +174,7 @@
 #define IRQ_PORT2 0x02
 
 typedef unsigned short uip_stats_t;
-typedef unsigned short clock_time_t;
+typedef unsigned long clock_time_t;
 
 typedef unsigned long off_t;
 #define ROM_ERASE_UNIT_SIZE  512