From cf3827829d811d5b0ff376a93bf663383522e323 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Fri, 9 Mar 2012 20:35:49 +0100
Subject: [PATCH] Added resource definition for button, leds, and battery, and
 removed obsolete compiler setup

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

diff --git a/platform/esb/contiki-conf.h b/platform/esb/contiki-conf.h
index a577b7fe0..7b3ef0252 100644
--- a/platform/esb/contiki-conf.h
+++ b/platform/esb/contiki-conf.h
@@ -1,6 +1,10 @@
 #ifndef __CONTIKI_CONF_H__
 #define __CONTIKI_CONF_H__
 
+#define PLATFORM_HAS_LEDS    1
+#define PLATFORM_HAS_BUTTON  1
+#define PLATFORM_HAS_BATTERY 1
+
 /* DCO speed resynchronization for more robust UART, etc. */
 #define DCOSYNCH_CONF_ENABLED 1
 #define DCOSYNCH_CONF_PERIOD 30
@@ -11,15 +15,6 @@
 #define PROFILE_CONF_ON 0
 #define ENERGEST_CONF_ON 1
 
-#ifdef __IAR_SYSTEMS_ICC__
-#define __MSP430F149__ 1
-#define __MSP430__ 1
-#define CC_CONF_INLINE
-#define BV(x) (1 << x)
-#else
-#define CC_CONF_INLINE inline
-#endif
-
 #define HAVE_STDINT_H
 #include "msp430def.h"
 
diff --git a/platform/esb/contiki-esb-main.c b/platform/esb/contiki-esb-main.c
index 8267c0738..d052f453b 100644
--- a/platform/esb/contiki-esb-main.c
+++ b/platform/esb/contiki-esb-main.c
@@ -305,8 +305,6 @@ main(void)
       watchdog_start();
     }
   }
-
-  return 0;
 }
 /*---------------------------------------------------------------------------*/
 /* char *arg_alloc(char size) {return NULL;} */