From 1c6c4ba2f149783d0702d85280e02e49f78dafff Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Wed, 11 Jan 2012 00:22:18 +0100
Subject: [PATCH] Added resource definition for button and removed obsolete
 compiler setup (compiler setup is now handled by cpu/msp430/msp430def.h)

---
 platform/z1/Makefile.common   |  2 +-
 platform/z1/platform-conf.h   | 18 ++----------------
 platform/z1sp/platform-conf.h |  9 ++-------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/platform/z1/Makefile.common b/platform/z1/Makefile.common
index c2629b07e..f44d070bc 100644
--- a/platform/z1/Makefile.common
+++ b/platform/z1/Makefile.common
@@ -7,7 +7,7 @@ CFLAGS+=-Os -g
 endif
 
 ifdef IAR
-CFLAGS+=-e --vla -Ohz --multiplier=16s --core=430X --double=32
+CFLAGS += -D__MSP430F2617__=1 -e --vla -Ohz --multiplier=16s --core=430X --double=32
 endif
 
 CLEAN += symbols.c symbols.h
diff --git a/platform/z1/platform-conf.h b/platform/z1/platform-conf.h
index a8f4ce19a..ed46991b5 100644
--- a/platform/z1/platform-conf.h
+++ b/platform/z1/platform-conf.h
@@ -25,13 +25,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id: platform-conf.h,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 
 /**
  * \file
- *         A brief description of what this file is
+ *         Platform configuration for the Z1 platform
  * \author
  *         Joakim Eriksson <joakime@sics.se>
  */
@@ -46,19 +44,7 @@
 #define ZOLERTIA_Z1 1  /* Enric */
 
 #define PLATFORM_HAS_LEDS   1
-
-#ifdef __IAR_SYSTEMS_ICC__
-#include <intrinsics.h>
-#include <in430.h>
-#define dint() __disable_interrupt()
-#define eint() __enable_interrupt()
-#define __MSP430F2617__ 1
-#define __MSP430__ 1
-#define CC_CONF_INLINE
-#define BV(x) (1 << x)
-#else
-#define CC_CONF_INLINE inline
-#endif
+#define PLATFORM_HAS_BUTTON 1
 
 /* CPU target speed in Hz */
 #define F_CPU 8000000uL /* 8MHz by default */
diff --git a/platform/z1sp/platform-conf.h b/platform/z1sp/platform-conf.h
index c25d822d9..aae55d639 100644
--- a/platform/z1sp/platform-conf.h
+++ b/platform/z1sp/platform-conf.h
@@ -25,13 +25,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id: platform-conf.h,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 
 /**
  * \file
- *         A brief description of what this file is
+ *         Platform configuration for the Z1SP platform
  * \author
  *         Joakim Eriksson <joakime@sics.se>
  */
@@ -47,8 +45,7 @@
 #define ZOLERTIA_Z1SP 1  /* Enric */
 
 /* CPU target speed in Hz */
-/* CPU target speed in Hz */
-#define F_CPU 8000000uL // 8MHz by default 
+#define F_CPU 8000000uL /* 8MHz by default */
 //Enric #define F_CPU 3900000uL /*2457600uL*/
 
 /* Our clock resolution, this is the same as Unix HZ. */
@@ -59,8 +56,6 @@
 #define CCIF
 #define CLIF
 
-#define CC_CONF_INLINE inline
-
 #define HAVE_STDINT_H
 #include "msp430def.h"