Merge pull request contiki-os#2706 from pjonsson/sky-merge-files

msp430: merge platform files

Author: nvt

arch/platform/sky/Makefile.sky

@@ -1,6 +1,4 @@
-# $Id: Makefile.sky,v 1.38 2010/05/03 13:51:11 nifi Exp $
-
-CONTIKI_TARGET_SOURCEFILES += contiki-sky-platform.c \
+CONTIKI_TARGET_SOURCEFILES += \
 	sht11.c sht11-sensor.c light-sensor.c battery-sensor.c \
 	button-sensor.c
 

arch/platform/sky/contiki-sky-platform.c

@@ -32,6 +32,7 @@
 #include <string.h>
 #include "contiki.h"
 #include "sys/energest.h"
+#include "dev/button-sensor.h"
 #include "dev/radio/cc2420/cc2420.h"
 #include "dev/etc/ds2411/ds2411.h"
 #include "dev/leds.h"
@@ -64,7 +65,8 @@ extern int msp430_dco_required;
 #include "experiment-setup.h"
 #endif
 
-void init_platform(void);
+SENSORS(&button_sensor);
+
 /*---------------------------------------------------------------------------*/
 /* Log configuration */
 #include "sys/log.h"
@@ -166,7 +168,7 @@ platform_init_stage_three(void)
   uint8_t longaddr[8];
   uint16_t shortaddr;
 
-  init_platform();
+  process_start(&sensors_process, NULL);
 
   shortaddr = (linkaddr_node_addr.u8[0] << 8) + linkaddr_node_addr.u8[1];
   memset(longaddr, 0, sizeof(longaddr));

arch/platform/sky/platform.c

@@ -1,7 +1,5 @@
 # Common Makefile between Z1 and Z1SP
 
-CONTIKI_TARGET_SOURCEFILES += contiki-z1-platform.c 
-
 include $(CONTIKI_NG_RELOC_PLATFORM_DIR)/z1/Makefile.common
 
 ifeq ($(ZOLERTIA_Z1SP),1)

arch/platform/z1/Makefile.z1

@@ -33,6 +33,7 @@
 #include <stdarg.h>
 
 #include "contiki.h"
+#include "dev/button-sensor.h"
 #include "dev/radio/cc2420/cc2420.h"
 #include "dev/leds.h"
 #include "dev/serial-line.h"
@@ -71,7 +72,6 @@ static uint8_t is_gateway;
 #include "experiment-setup.h"
 #endif
 
-void init_platform(void);
 /*---------------------------------------------------------------------------*/
 /* Log configuration */
 #include "sys/log.h"
@@ -233,7 +233,7 @@ platform_init_stage_three(void)
   uint8_t longaddr[8];
   uint16_t shortaddr;
 
-  init_platform();
+  process_start(&sensors_process, NULL);
 
   shortaddr = (linkaddr_node_addr.u8[0] << 8) + linkaddr_node_addr.u8[1];
   memset(longaddr, 0, sizeof(longaddr));