From 1f835946ca1e9c0a455091a80202c3c87aeb56bb Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Tue, 22 May 2007 21:12:15 +0000
Subject: [PATCH] Added X-MAC configuration, reduced ELF loader text memory
 size

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

diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index d33a16af0..80a612a66 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,11 +1,11 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.15 2007/05/12 21:02:23 oliverschmidt Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.16 2007/05/22 21:12:15 adamdunkels Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
 
 #define ELFLOADER_CONF_DATAMEMORY_SIZE 0x1800
-#define ELFLOADER_CONF_TEXTMEMORY_SIZE 0x2000
+#define ELFLOADER_CONF_TEXTMEMORY_SIZE 0x1000
 
 #define LPM_CONF_OFF LPM4_EXIT
 
@@ -29,7 +29,6 @@ void msp430_cpu_init(void);	/* Rename to cpu_init() later! */
 #define splx(sr) __asm__ __volatile__("bis %0, r2" : : "r" (sr))
 
 #define TMOTE_SKY 1
-#define WITH_UIP 1
 #define WITH_ASCII 1
 
 #define PROCESS_CONF_FASTPOLL    4
@@ -82,6 +81,9 @@ typedef unsigned long off_t;
 #define ROM_ERASE_UNIT_SIZE  512
 #define XMEM_ERASE_UNIT_SIZE (64*1024L)
 
+#define XMAC_CONF_ON_TIME RTIMER_ARCH_SECOND / 100
+#define XMAC_CONF_OFF_TIME RTIMER_ARCH_SECOND / 10
+
 /* Use the first 64k of external flash for node configuration */
 #define NODE_ID_XMEM_OFFSET     (0 * XMEM_ERASE_UNIT_SIZE)
 
@@ -180,4 +182,5 @@ typedef unsigned long off_t;
 #define SPI_ENABLE()    ( P4OUT &= ~BV(CSN) ) /* ENABLE CSn (active low) */
 #define SPI_DISABLE()   ( P4OUT |=  BV(CSN) ) /* DISABLE CSn (active low) */
 
+
 #endif /* CONTIKI_CONF_H */