board/z1: added (x)timer configuration

boards/z1/Makefile.features

@@ -1 +1,2 @@
+FEATURES_PROVIDED += periph_timer
 FEATURES_MCU_GROUP = msp430

boards/z1/include/board.h

@@ -1,6 +1,6 @@
 /*
- * board.h - Zolertia Z1 Board.
  * Copyright (C) 2014 INRIA
+ *               2015 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -20,13 +20,12 @@
 \li CC2420
 
 * @{
-*/
-
-/**
+*
  * @file
  * @brief       Zolertia Z1 board configuration
  *
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  *
  */
 
@@ -40,6 +39,21 @@ extern "C" {
 #define __MSP430F2617__
 #endif
 
+/**
+ * @brief   Xtimer configuration
+ * @{
+ */
+#define XTIMER                      (0)
+#define XTIMER_CHAN                 (0)
+#define XTIMER_MASK                 (0xffff0000)
+/** @} */
+
+/**
+ * @brief   Defines for compatibility with hwtimer
+ * @deprecated
+ */
+#define HW_TIMER                    (0)
+
 /*  MSP430 core */
 #define MSP430_INITIAL_CPU_SPEED    8000000uL
 #ifndef F_CPU

boards/z1/include/periph_conf.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 INRIA
+ *               2015 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License v2.1. See the file LICENSE in the top level directory for more
@@ -14,11 +15,28 @@
  * @brief       Zolertia Z1 peripheral configuration
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
-/* make Travis happy: #ifdef __cplusplus extern "C" { #endif */
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#endif /* PERIPH_CONF_H_ */
+/**
+ * @brief   Timer configuration
+ * @{
+ */
+#define TIMER_DEV           (TIMER_A)
+#define TIMER_CHAN          (3)
+#define TIMER_ISR_CC0       (TIMERA0_VECTOR)
+#define TIMER_ISR_CCX       (TIMERA1_VECTOR)
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PERIPH_CONF_H */