drivers/kw2xrf: update default params on init

RIOT-OS · Feb 7, 2017 · e617d74 · e617d74
1 parent 432b03e
commit e617d74
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 55 deletions.
diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h
@@ -65,13 +65,14 @@ extern "C"
 /** @} */
 
 /**
-@name KW2XRF configuration
-@{
-*/
-#define KW2XRF_SPI          (SPI_DEV(1))
-#define KW2XRF_CS           (GPIO_PIN(KW2XDRF_PORT, KW2XDRF_PCS0_PIN))
-#define KW2XRF_INT          (GPIO_PIN(KW2XDRF_PORT, KW2XDRF_IRQ_PIN))
-#define KW2XRF_SPI_CLK      (SPI_CLK_10MHZ)
+ * @name KW2XRF configuration
+ *
+ * {spi bus, cs pin, int pin, spi speed,}
+ */
+#define KW2XRF_PARAMS_BOARD  {.spi = SPI_DEV(1), \
+                              .spi_clk = SPI_CLK_10MHZ, \
+                              .cs_pin = GPIO_PIN(KW2XDRF_PORT, KW2XDRF_PCS0_PIN), \
+                              .int_pin = GPIO_PIN(KW2XDRF_PORT, KW2XDRF_IRQ_PIN) }
 #define KW2XRF_SHARED_SPI   0
 /** @}*/
 

diff --git a/boards/pba-d-01-kw2x/include/kw2xrf_params.h b/boards/pba-d-01-kw2x/include/kw2xrf_params.h
diff --git a/drivers/kw2xrf/include/kw2xrf_params.h b/drivers/kw2xrf/include/kw2xrf_params.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2017 Hamburg University of Applied Sciences
+ *
+ * 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 details.
+ */
+
+/**
+ * @ingroup     drivers_kw2xrf
+ *
+ * @{
+ * @file
+ * @brief       Default configuration for the KW2XRF driver
+ *
+ * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
+ */
+
+#ifndef KW2XRF_PARAMS_H
+#define KW2XRF_PARAMS_H
+
+#include "board.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief   Set default configuration parameters for the KW2XRF driver
+ * @{
+ */
+#ifndef KW2XRF_PARAM_SPI
+#define KW2XRF_PARAM_SPI         (SPI_DEV(0))
+#endif
+#ifndef KW2XRF_PARAM_SPI_CLK
+#define KW2XRF_PARAM_SPI_CLK     (SPI_CLK_10MHZ)
+#endif
+#ifndef KW2XRF_PARAM_CS
+#define KW2XRF_PARAM_CS          (GPIO_PIN(0, 0))
+#endif
+#ifndef KW2XRF_PARAM_INT
+#define KW2XRF_PARAM_INT         (GPIO_PIN(0, 1))
+#endif
+#ifndef KW2XRF_PARAM_SLEEP
+#define KW2XRF_PARAM_SLEEP       (GPIO_PIN(0, 2))
+#endif
+#ifndef KW2XRF_PARAM_RESET
+#define KW2XRF_PARAM_RESET       (GPIO_PIN(0, 3))
+#endif
+
+#define KW2XRF_PARAMS_DEFAULT    {.spi = KW2XRF_PARAM_SPI, \
+                                  .spi_clk = KW2XRF_PARAM_SPI_CLK, \
+                                  .cs_pin = KW2XRF_PARAM_CS, \
+                                  .int_pin = KW2XRF_PARAM_INT }
+/**@}*/
+
+/**
+ * @brief   KW2XRF configuration
+ */
+static const kw2xrf_params_t kw2xrf_params[] =
+{
+#ifdef KW2XRF_PARAMS_BOARD
+    KW2XRF_PARAMS_BOARD,
+#else
+    KW2XRF_PARAMS_DEFAULT,
+#endif
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KW2XRF_PARAMS_H */
+/** @} */
diff --git a/sys/auto_init/netif/auto_init_kw2xrf.c b/sys/auto_init/netif/auto_init_kw2xrf.c
@@ -44,7 +44,7 @@
 
 static kw2xrf_t kw2xrf_devs[KW2XRF_NUM];
 static gnrc_netdev2_t gnrc_adpt[KW2XRF_NUM];
-static char _nomac_stacks[KW2XRF_MAC_STACKSIZE][KW2XRF_NUM];
+static char _kw2xrf_stacks[KW2XRF_NUM][KW2XRF_MAC_STACKSIZE];
 
 void auto_init_kw2xrf(void)
 {
@@ -57,7 +57,7 @@ void auto_init_kw2xrf(void)
             LOG_ERROR("[auto_init_netif] error, initializing kw2xrf #%u\n", i);
         }
         else {
-            gnrc_netdev2_init(_nomac_stacks[i], KW2XRF_MAC_STACKSIZE,
+            gnrc_netdev2_init(_kw2xrf_stacks[i], KW2XRF_MAC_STACKSIZE,
                               KW2XRF_MAC_PRIO, "kw2xrf", &gnrc_adpt[i]);
         }
     }