[UNTESTED] Resurrect FSMC support.

fsmc_sram_init_gpios() is now series-specific, so move its existing
implementation to the F1 backend, and add libmaple/stm32f2/fsmc.c for
the F2 backend.

Delete libmaple/fsmc.c; it is now empty.

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

5 files changed, 106 insertions, 8 deletions

diff --git a/libmaple/include/libmaple/fsmc.h b/libmaple/include/libmaple/fsmc.h
index a83f7ab..df211b2 100644
--- a/libmaple/include/libmaple/fsmc.h
+++ b/libmaple/include/libmaple/fsmc.h
@@ -280,6 +280,9 @@ typedef struct fsmc_nor_psram_reg_map {
  * SRAM/NOR Flash routines
  */
 
+/**
+ * @brief Configure FSMC GPIOs for use with SRAM.
+ */
 void fsmc_sram_init_gpios(void);
 
 /**
diff --git a/libmaple/fsmc.c b/libmaple/stm32f1/fsmc.c
index bf4611d..8e01b5e 100644
--- a/libmaple/fsmc.c
+++ b/libmaple/stm32f1/fsmc.c
@@ -1,6 +1,7 @@
 /******************************************************************************
  * The MIT License
  *
+ * Copyright (c) 2012 LeafLabs, LLC.
  * Copyright (c) 2010 Bryan Newbold.
  *
  * Permission is hereby granted, free of charge, to any person
@@ -25,18 +26,19 @@
  *****************************************************************************/
 
 /**
- * @file fsmc.c
- * @brief Flexible static memory controller support.
+ * @file stm32f1/fsmc.c
+ * @author Marti Bolivar <mbolivar@leaflabs.com>,
+ *         Bryan Newbold <bnewbold@robocracy.org>
+ * @brief STM32F1 FSMC support.
  */
 
+#include <libmaple/stm32.h>
+
+#if STM32_HAVE_FSMC /* Don't try building the rest for MCUs without FSMC */
+
 #include <libmaple/fsmc.h>
 #include <libmaple/gpio.h>
 
-#ifdef STM32_HIGH_DENSITY
-
-/**
- * Configure FSMC GPIOs for use with SRAM.
- */
 void fsmc_sram_init_gpios(void) {
     /* Data lines... */
     gpio_set_mode(GPIOD,  0, GPIO_AF_OUTPUT_PP);
@@ -90,4 +92,4 @@ void fsmc_sram_init_gpios(void) {
     gpio_set_mode(GPIOE,  1, GPIO_AF_OUTPUT_PP);   // NBL1
 }
 
-#endif  /* STM32_HIGH_DENSITY */
+#endif  /* STM32_HAVE_FSMC */
diff --git a/libmaple/stm32f1/rules.mk b/libmaple/stm32f1/rules.mk
index 3d34797..b961d77 100644
--- a/libmaple/stm32f1/rules.mk
+++ b/libmaple/stm32f1/rules.mk
@@ -12,6 +12,7 @@ sSRCS_$(d) := isrs_performance.S            \
               vector_table_performance.S
 
 cSRCS_$(d) := rcc.c
+cSRCS_$(d) += fsmc.c
 cSRCS_$(d) += gpio.c
 cSRCS_$(d) += bkp.c
 cSRCS_$(d) += usart.c
diff --git a/libmaple/stm32f2/fsmc.c b/libmaple/stm32f2/fsmc.c
new file mode 100644
index 0000000..9b23eea
--- /dev/null
+++ b/libmaple/stm32f2/fsmc.c
@@ -0,0 +1,90 @@
+/******************************************************************************
+ * 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 stm32f2/fsmc.c
+ * @author Marti Bolivar <mbolivar@leaflabs.com>,
+ * @brief STM32F2 FSMC support.
+ */
+
+#include <libmaple/fsmc.h>
+#include <libmaple/gpio.h>
+
+#define CONFIG_GPIO(dev, bit)                                           \
+    do {                                                                \
+        gpio_set_modef(dev, bit, GPIO_MODE_AF, GPIO_MODEF_SPEED_HIGH);  \
+        gpio_set_af(dev, bit, GPIO_AF_FSMC_SDIO_OTG_FS);                \
+    } while (0)
+void fsmc_sram_init_gpios(void) {
+    /* Data lines... */
+    CONFIG_GPIO(GPIOD,  0);
+    CONFIG_GPIO(GPIOD,  1);
+    CONFIG_GPIO(GPIOD,  8);
+    CONFIG_GPIO(GPIOD,  9);
+    CONFIG_GPIO(GPIOD, 10);
+    CONFIG_GPIO(GPIOD, 14);
+    CONFIG_GPIO(GPIOD, 15);
+    CONFIG_GPIO(GPIOE,  7);
+    CONFIG_GPIO(GPIOE,  8);
+    CONFIG_GPIO(GPIOE,  9);
+    CONFIG_GPIO(GPIOE, 10);
+    CONFIG_GPIO(GPIOE, 11);
+    CONFIG_GPIO(GPIOE, 12);
+    CONFIG_GPIO(GPIOE, 13);
+    CONFIG_GPIO(GPIOE, 14);
+    CONFIG_GPIO(GPIOE, 15);
+
+    /* Address lines... */
+    CONFIG_GPIO(GPIOD, 11);
+    CONFIG_GPIO(GPIOD, 12);
+    CONFIG_GPIO(GPIOD, 13);
+    CONFIG_GPIO(GPIOF,  0);
+    CONFIG_GPIO(GPIOF,  1);
+    CONFIG_GPIO(GPIOF,  2);
+    CONFIG_GPIO(GPIOF,  3);
+    CONFIG_GPIO(GPIOF,  4);
+    CONFIG_GPIO(GPIOF,  5);
+    CONFIG_GPIO(GPIOF, 12);
+    CONFIG_GPIO(GPIOF, 13);
+    CONFIG_GPIO(GPIOF, 14);
+    CONFIG_GPIO(GPIOF, 15);
+    CONFIG_GPIO(GPIOG,  0);
+    CONFIG_GPIO(GPIOG,  1);
+    CONFIG_GPIO(GPIOG,  2);
+    CONFIG_GPIO(GPIOG,  3);
+    CONFIG_GPIO(GPIOG,  4);
+    CONFIG_GPIO(GPIOG,  5);
+
+    /* And control lines... */
+    CONFIG_GPIO(GPIOD,  4);
+    CONFIG_GPIO(GPIOD,  5);
+    CONFIG_GPIO(GPIOD,  7);
+    CONFIG_GPIO(GPIOG,  9);
+    CONFIG_GPIO(GPIOG, 10);
+    CONFIG_GPIO(GPIOG, 12);
+    CONFIG_GPIO(GPIOE,  0);
+    CONFIG_GPIO(GPIOE,  1);
+}
diff --git a/libmaple/stm32f2/rules.mk b/libmaple/stm32f2/rules.mk
index 54fa068..8711090 100644
--- a/libmaple/stm32f2/rules.mk
+++ b/libmaple/stm32f2/rules.mk
@@ -9,7 +9,9 @@ CFLAGS_$(d) = -I$(d) $(LIBMAPLE_INCLUDES) $(LIBMAPLE_PRIVATE_INCLUDES) -Wall -We
 
 # Local rules and targets
 sSRCS_$(d) := isrs.S vector_table.S
+
 cSRCS_$(d) := rcc.c
+cSRCS_$(d) += fsmc.c
 cSRCS_$(d) += gpio.c
 cSRCS_$(d) += usart.c