From 2ca32f9c764060cbc38d202fe62596ee540cd471 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Mon, 21 Jun 2010 15:15:10 +0000
Subject: [PATCH] Enabled 32-bit clock ticks to allow longer timeouts.

---
 platform/esb/contiki-conf.h     | 6 +++---
 platform/esb/contiki-esb-main.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/esb/contiki-conf.h b/platform/esb/contiki-conf.h
index 170dd6f8f..eb2e3bac1 100644
--- a/platform/esb/contiki-conf.h
+++ b/platform/esb/contiki-conf.h
@@ -23,7 +23,7 @@
 
 /* Our clock resolution, this is the same as Unix HZ. Must be a power
    of two (see clock.c for details). */
-#define CLOCK_CONF_SECOND 64
+#define CLOCK_CONF_SECOND 64UL
 
 #define NODE_ID_EEPROM_OFFSET     0x0010 /* - 0x0014 */
 #define CFS_EEPROM_CONF_OFFSET    0x0040
@@ -38,7 +38,7 @@
 #define CCIF
 #define CLIF
 
-typedef unsigned short clock_time_t;
+typedef unsigned long clock_time_t;
 
 void clock_wait(int ms10);
 
@@ -65,7 +65,7 @@ void clock_wait(int ms10);
 
 #define NETSTACK_CONF_NETWORK rime_driver
 #define NETSTACK_CONF_MAC     nullmac_driver
-#define NETSTACK_CONF_RDC     nullrdc_framer_driver
+#define NETSTACK_CONF_RDC     nullrdc_driver
 #define NETSTACK_CONF_FRAMER  framer_nullmac
 
 #define QUEUEBUF_CONF_NUM 1
diff --git a/platform/esb/contiki-esb-main.c b/platform/esb/contiki-esb-main.c
index 1fdec10c6..c184c21ae 100644
--- a/platform/esb/contiki-esb-main.c
+++ b/platform/esb/contiki-esb-main.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-esb-main.c,v 1.18 2010/03/02 22:40:39 nifi Exp $
+ * @(#)$Id: contiki-esb-main.c,v 1.19 2010/06/21 15:15:12 nifi Exp $
  */
 
 #include <io.h>
@@ -207,7 +207,7 @@ main(void)
 
   netstack_init();
 
-  printf("%s %s, channel check rate %u Hz\n",
+  printf("%s %s, channel check rate %lu Hz\n",
          NETSTACK_MAC.name, NETSTACK_RDC.name,
          CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:
                          NETSTACK_RDC.channel_check_interval()));