Bring back <libmaple/spi.h>.

Add a spi_private.h with a SPI_DEV(), for convenience. Use it in the
F1 and F2 implementations. We could probably unify these with an
STM32_HAVE_SPI(n) macro, but we'll leave that for the future.

Most everything from F1 is portable; F2 has some additional bit
definitions and a spi_get_af() routine, but that's about it.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>

8 files changed, 221 insertions, 25 deletions

diff --git a/libmaple/include/libmaple/spi.h b/libmaple/include/libmaple/spi.h
index 90e2036..45dc5a2 100644
--- a/libmaple/include/libmaple/spi.h
+++ b/libmaple/include/libmaple/spi.h
@@ -307,7 +307,7 @@ uint32 spi_tx(spi_dev *dev, const void *buf, uint32 len);
  * @brief Call a function on each SPI port
  * @param fn Function to call.
  */
-void spi_foreach(void (*fn)(spi_dev*));
+extern void spi_foreach(void (*fn)(spi_dev*));
 
 void spi_peripheral_enable(spi_dev *dev);
 void spi_peripheral_disable(spi_dev *dev);
diff --git a/libmaple/rules.mk b/libmaple/rules.mk
index 649e4c8..be93d2e 100644
--- a/libmaple/rules.mk
+++ b/libmaple/rules.mk
@@ -21,7 +21,7 @@ cSRCS_$(d) += iwdg.c
 cSRCS_$(d) += nvic.c
 cSRCS_$(d) += pwr.c
 cSRCS_$(d) += rcc.c
-# cSRCS_$(d) += spi.c
+cSRCS_$(d) += spi.c
 cSRCS_$(d) += systick.c
 cSRCS_$(d) += timer.c
 cSRCS_$(d) += usart.c
diff --git a/libmaple/spi_private.h b/libmaple/spi_private.h
new file mode 100644
index 0000000..f0e0bd1
--- /dev/null
+++ b/libmaple/spi_private.h
@@ -0,0 +1,37 @@
+/******************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2012 LeafLabs, LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *****************************************************************************/
+
+#ifndef _LIBMAPLE_SPI_PRIVATE_H_
+#define _LIBMAPLE_SPI_PRIVATE_H_
+
+#define SPI_DEV(num)                              \
+    {                                             \
+        .regs    = SPI##num##_BASE,               \
+        .clk_id  = RCC_SPI##num,                  \
+        .irq_num = NVIC_SPI##num,                 \
+    }
+
+#endif
diff --git a/libmaple/stm32f1/include/series/spi.h b/libmaple/stm32f1/include/series/spi.h
index 8cc4c4d..d288a0c 100644
--- a/libmaple/stm32f1/include/series/spi.h
+++ b/libmaple/stm32f1/include/series/spi.h
@@ -46,11 +46,8 @@ extern "C" {
 
 struct spi_reg_map;
 
-/** SPI1 register map base pointer */
 #define SPI1_BASE                       ((struct spi_reg_map*)0x40013000)
-/** SPI2 register map base pointer */
 #define SPI2_BASE                       ((struct spi_reg_map*)0x40003800)
-/** SPI3 register map base pointer */
 #define SPI3_BASE                       ((struct spi_reg_map*)0x40003C00)
 
 /*
diff --git a/libmaple/stm32f1/spi.c b/libmaple/stm32f1/spi.c
index 72f2ef4..1c78cc3 100644
--- a/libmaple/stm32f1/spi.c
+++ b/libmaple/stm32f1/spi.c
@@ -33,35 +33,20 @@
 
 #include <libmaple/spi.h>
 #include <libmaple/gpio.h>
+#include "spi_private.h"
 
 /*
  * Devices
  */
 
-static spi_dev spi1 = {
-    .regs    = SPI1_BASE,
-    .clk_id  = RCC_SPI1,
-    .irq_num = NVIC_SPI1,
-};
-static spi_dev spi2 = {
-    .regs    = SPI2_BASE,
-    .clk_id  = RCC_SPI2,
-    .irq_num = NVIC_SPI2,
-};
-#if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
-static spi_dev spi3 = {
-    .regs    = SPI3_BASE,
-    .clk_id  = RCC_SPI3,
-    .irq_num = NVIC_SPI3,
-};
-#endif
+static spi_dev spi1 = SPI_DEV(1);
+static spi_dev spi2 = SPI_DEV(2);
 
-/** SPI device 1 */
 spi_dev *SPI1 = &spi1;
-/** SPI device 2 */
 spi_dev *SPI2 = &spi2;
+
 #if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
-/** SPI device 3 */
+static spi_dev spi3 = SPI_DEV(3);
 spi_dev *SPI3 = &spi3;
 #endif
 
diff --git a/libmaple/stm32f2/include/series/spi.h b/libmaple/stm32f2/include/series/spi.h
new file mode 100644
index 0000000..7b9f94a
--- /dev/null
+++ b/libmaple/stm32f2/include/series/spi.h
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2012 LeafLabs, LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *****************************************************************************/
+
+/**
+ * @file libmaple/stm32f2/include/series/spi.h
+ * @author Marti Bolivar <mbolivar@leaflabs.com>
+ * @brief STM32F2 SPI/I2S series header.
+ */
+
+#ifndef _LIBMAPLE_STM32F2_SPI_H_
+#define _LIBMAPLE_STM32F2_SPI_H_
+
+#include <libmaple/gpio.h>      /* for gpio_af */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Register map base pointers
+ */
+
+struct spi_reg_map;
+
+#define SPI1_BASE                       ((struct spi_reg_map*)0x40013000)
+#define SPI2_BASE                       ((struct spi_reg_map*)0x40003800)
+#define SPI3_BASE                       ((struct spi_reg_map*)0x40003C00)
+
+/*
+ * Register bit definitions
+ */
+
+/* Control register 2 */
+
+#define SPI_CR2_FRF_BIT                 4
+
+#define SPI_CR2_FRF                     (1U << SPI_CR2_FRF_BIT)
+
+/* Status register */
+
+#define SPI_SR_TIFRFE_BIT               8
+
+#define SPI_SR_TIFRFE                   (1U << SPI_SR_TIFRFE_BIT)
+
+/*
+ * Device pointers
+ */
+
+struct spi_dev;
+
+extern struct spi_dev *SPI1;
+extern struct spi_dev *SPI2;
+extern struct spi_dev *SPI3;
+
+/*
+ * Routines
+ */
+
+gpio_af spi_get_af(struct spi_dev *dev);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/libmaple/stm32f2/rules.mk b/libmaple/stm32f2/rules.mk
index fd6b933..759f905 100644
--- a/libmaple/stm32f2/rules.mk
+++ b/libmaple/stm32f2/rules.mk
@@ -16,6 +16,7 @@ cSRCS_$(d) += exti.c
 cSRCS_$(d) += fsmc.c
 cSRCS_$(d) += gpio.c
 cSRCS_$(d) += rcc.c
+cSRCS_$(d) += spi.c
 cSRCS_$(d) += syscfg.c
 cSRCS_$(d) += timer.c
 cSRCS_$(d) += usart.c
diff --git a/libmaple/stm32f2/spi.c b/libmaple/stm32f2/spi.c
new file mode 100644
index 0000000..cfd9995
--- /dev/null
+++ b/libmaple/stm32f2/spi.c
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2012 LeafLabs, LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *****************************************************************************/
+
+/**
+ * @file libmaple/stm32f2/spi.c
+ * @author Marti Bolivar <mbolivar@leaflabs.com>
+ * @brief STM32F2 SPI/I2S.
+ */
+
+#include <libmaple/spi.h>
+#include "spi_private.h"
+
+/*
+ * Devices
+ */
+
+static spi_dev spi1 = SPI_DEV(1);
+static spi_dev spi2 = SPI_DEV(2);
+static spi_dev spi3 = SPI_DEV(3);
+
+spi_dev *SPI1 = &spi1;
+spi_dev *SPI2 = &spi2;
+spi_dev *SPI3 = &spi3;
+
+/*
+ * Routines
+ */
+
+void spi_config_gpios(spi_dev *dev,
+                      uint8 as_master,
+                      gpio_dev *nss_dev,
+                      uint8 nss_bit,
+                      gpio_dev *comm_dev,
+                      uint8 sck_bit,
+                      uint8 miso_bit,
+                      uint8 mosi_bit) {
+    gpio_af dev_af = spi_get_af(dev);
+    gpio_set_mode(nss_dev, nss_bit, GPIO_MODE_AF);
+    gpio_set_mode(comm_dev, sck_bit, GPIO_MODE_AF);
+    gpio_set_mode(comm_dev, miso_bit, GPIO_MODE_AF);
+    gpio_set_mode(comm_dev, mosi_bit, GPIO_MODE_AF);
+    gpio_set_af(nss_dev, nss_bit, dev_af);
+    gpio_set_af(comm_dev, sck_bit, dev_af);
+    gpio_set_af(comm_dev, miso_bit, dev_af);
+    gpio_set_af(comm_dev, mosi_bit, dev_af);
+}
+
+void spi_foreach(void (*fn)(spi_dev*)) {
+    fn(SPI1);
+    fn(SPI2);
+    fn(SPI3);
+}
+
+gpio_af spi_get_af(spi_dev *dev) {
+    switch (dev->clk_id) {
+    case RCC_SPI1:              /* Fall through */
+    case RCC_SPI2:
+        return GPIO_AF_SPI_1_2;
+    case RCC_SPI3:
+        return GPIO_AF_SPI3;
+    default:
+        ASSERT(0);              /* Can't happen */
+        return (gpio_af)-1;
+    }
+}