examples/blinky.cpp works on F2.

Only OUTPUT mode is tested; any other modes might work, but no
guarantees.

Bring back:

- wirish/wirish_digital.cpp
- wirish/cxxabi-compat.cpp
- wirish/wirish_time.cpp

Add new:

- wirish/stm32f1/wirish_digital.cpp
- wirish/stm32f2/wirish_digital.cpp

Move pinMode() from wirish/wirish_digital.cpp into the file by the
same basename in wirish/stm32f1. This implementation is tied to
F1. Add an F2 implementation in wirish/stm32f2/wirish_digital.cpp.

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

4 files changed, 227 insertions, 60 deletions

diff --git a/wirish/rules.mk b/wirish/rules.mk
index afd78e2..5e00a5f 100644
--- a/wirish/rules.mk
+++ b/wirish/rules.mk
@@ -21,6 +21,12 @@ CFLAGS_$(d) := $(LIBMAPLE_INCLUDES) $(WIRISH_INCLUDES) -I$(d)
 sSRCS_$(d) := start.S
 cSRCS_$(d) := start_c.c
 cppSRCS_$(d) := boards.cpp
+cppSRCS_$(d) += cxxabi-compat.cpp
+cppSRCS_$(d) +=	wirish_digital.cpp
+cppSRCS_$(d) +=	wirish_time.cpp
+cppSRCS_$(d) += $(MCU_SERIES)/boards_setup.cpp
+cppSRCS_$(d) += $(MCU_SERIES)/wirish_digital.cpp
+cppSRCS_$(d) += $(WIRISH_BOARD_PATH)/board.cpp
 # TODO: test these on F2 and put them back in:
 # cppSRCS_$(d) := wirish_math.cpp		 \
 #                 Print.cpp		 \
@@ -28,16 +34,10 @@ cppSRCS_$(d) := boards.cpp
 #                 HardwareSPI.cpp		 \
 # 		HardwareTimer.cpp	 \
 #                 usb_serial.cpp		 \
-#                 cxxabi-compat.cpp	 \
 # 		wirish_shift.cpp	 \
 # 		wirish_analog.cpp	 \
-# 		wirish_time.cpp		 \
 # 		pwm.cpp 		 \
-# 		ext_interrupts.cpp	 \
-# 		wirish_digital.cpp
-# TODO: Put this back in once we've got the necessary libmaple support back.
-cppSRCS_$(d) += $(WIRISH_BOARD_PATH)/board.cpp
-cppSRCS_$(d) += $(MCU_SERIES)/boards_setup.cpp
+# 		ext_interrupts.cpp
 
 sFILES_$(d)   := $(sSRCS_$(d):%=$(d)/%)
 cFILES_$(d)   := $(cSRCS_$(d):%=$(d)/%)
diff --git a/wirish/stm32f1/wirish_digital.cpp b/wirish/stm32f1/wirish_digital.cpp
new file mode 100644
index 0000000..8371b0e
--- /dev/null
+++ b/wirish/stm32f1/wirish_digital.cpp
@@ -0,0 +1,89 @@
+/******************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2010 Perry Hung.
+ * 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.
+ *****************************************************************************/
+
+/*
+ * STM32F1 implementations for basic GPIO functionality.
+ */
+
+#include <wirish/io.h>
+
+#include <libmaple/gpio.h>
+#include <libmaple/timer.h>
+
+#include <wirish/boards.h>
+
+void pinMode(uint8 pin, WiringPinMode mode) {
+    gpio_pin_mode outputMode;
+    bool pwm = false;
+
+    if (pin >= BOARD_NR_GPIO_PINS) {
+        return;
+    }
+
+    switch(mode) {
+    case OUTPUT:
+        outputMode = GPIO_OUTPUT_PP;
+        break;
+    case OUTPUT_OPEN_DRAIN:
+        outputMode = GPIO_OUTPUT_OD;
+        break;
+    case INPUT:
+    case INPUT_FLOATING:
+        outputMode = GPIO_INPUT_FLOATING;
+        break;
+    case INPUT_ANALOG:
+        outputMode = GPIO_INPUT_ANALOG;
+        break;
+    case INPUT_PULLUP:
+        outputMode = GPIO_INPUT_PU;
+        break;
+    case INPUT_PULLDOWN:
+        outputMode = GPIO_INPUT_PD;
+        break;
+    case PWM:
+        outputMode = GPIO_AF_OUTPUT_PP;
+        pwm = true;
+        break;
+    case PWM_OPEN_DRAIN:
+        outputMode = GPIO_AF_OUTPUT_OD;
+        pwm = true;
+        break;
+    default:
+        ASSERT(0);
+        return;
+    }
+
+    gpio_set_mode(PIN_MAP[pin].gpio_device, PIN_MAP[pin].gpio_bit, outputMode);
+
+    if (PIN_MAP[pin].timer_device != NULL) {
+        /* Enable/disable timer channels if we're switching into or
+         * out of PWM. */
+        timer_set_mode(PIN_MAP[pin].timer_device,
+                       PIN_MAP[pin].timer_channel,
+                       pwm ? TIMER_PWM : TIMER_DISABLED);
+    }
+}
diff --git a/wirish/stm32f2/wirish_digital.cpp b/wirish/stm32f2/wirish_digital.cpp
new file mode 100644
index 0000000..a67111d
--- /dev/null
+++ b/wirish/stm32f2/wirish_digital.cpp
@@ -0,0 +1,130 @@
+/******************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/*
+ * STM32F2 implementations for basic GPIO functionality.
+ */
+
+#include <wirish/io.h>
+
+#include <libmaple/gpio.h>
+#include <libmaple/timer.h>
+
+#include <wirish/boards.h>
+
+void pinMode(uint8 pin, WiringPinMode w_mode) {
+    if (pin >= BOARD_NR_GPIO_PINS) {
+        return;
+    }
+
+    gpio_pin_mode mode;
+    // People always do the silly pin-toggle speed benchmark, so let's
+    // accomodate them:
+    unsigned flags = GPIO_MODEF_SPEED_HIGH;
+    bool pwm = false;
+    switch(w_mode) {
+    case OUTPUT:
+        mode = GPIO_MODE_OUTPUT;
+        break;
+    case OUTPUT_OPEN_DRAIN:
+        mode = GPIO_MODE_OUTPUT;
+        flags |= GPIO_MODEF_TYPE_OD;
+        break;
+    case INPUT:
+    case INPUT_FLOATING:
+        mode = GPIO_MODE_INPUT;
+        break;
+    case INPUT_ANALOG:
+        mode = GPIO_MODE_ANALOG;
+        break;
+    case INPUT_PULLUP:
+        mode = GPIO_MODE_INPUT;
+        flags |= GPIO_MODEF_PUPD_PU;
+        break;
+    case INPUT_PULLDOWN:
+        mode = GPIO_MODE_INPUT;
+        flags |= GPIO_MODEF_PUPD_PD;
+        break;
+    case PWM:
+        mode = GPIO_MODE_AF;
+        pwm = true;
+        break;
+    case PWM_OPEN_DRAIN:
+        mode = GPIO_MODE_AF;
+        flags |= GPIO_MODEF_TYPE_OD;
+        pwm = true;
+        break;
+    default:
+        ASSERT(0);              // Can't happen
+        return;
+    }
+
+    const stm32_pin_info *info = &PIN_MAP[pin];
+
+    if (pwm) {
+        /* If enabling PWM, tell the timer to do PWM, and tell the pin
+         * to listen to the right timer. */
+        ASSERT(info->timer_device != NULL);
+        if (info->timer_device == NULL) {
+            return;
+        }
+        gpio_af timer_af;
+        /* TODO make this code a <libmaple/timer.h> convenience
+         * routine for series that support GPIO alternate
+         * functions. */
+        switch(info->timer_device->clk_id) {
+        case RCC_TIMER1:        // fall-through
+        case RCC_TIMER2:
+            timer_af = GPIO_AF_TIM_1_2;
+            break;
+        case RCC_TIMER3:        // fall-through
+        case RCC_TIMER4:        // ...
+        case RCC_TIMER5:
+            timer_af = GPIO_AF_TIM_3_4_5;
+            break;
+        /* Timers 6 and 7 don't have any capture/compare, so they
+         * can't do PWM (and in fact have no AF values). */
+        case RCC_TIMER8:        // fall-through
+        case RCC_TIMER9:        // ...
+        case RCC_TIMER10:       // ...
+        case RCC_TIMER11:
+            timer_af = GPIO_AF_TIM_8_9_10_11;
+            break;
+        case RCC_TIMER12:       // fall-through
+        case RCC_TIMER13:       // ...
+        case RCC_TIMER14:
+            timer_af = GPIO_AF_CAN_1_2_TIM_12_13_14;
+            break;
+        default:
+            ASSERT(0);          // Can't happen
+            return;
+        }
+        timer_set_mode(info->timer_device, info->timer_channel, TIMER_PWM);
+        gpio_set_af(info->gpio_device, info->gpio_bit, timer_af);
+    } else {
+        gpio_set_modef(info->gpio_device, info->gpio_bit, mode, flags);
+    }
+}
diff --git a/wirish/wirish_digital.cpp b/wirish/wirish_digital.cpp
index 6be1a29..a7f10cd 100644
--- a/wirish/wirish_digital.cpp
+++ b/wirish/wirish_digital.cpp
@@ -2,6 +2,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Perry Hung.
+ * Copyright (c) 2012 LeafLabs, LLC.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -36,59 +37,6 @@
 #include <wirish/wirish_time.h>
 #include <wirish/boards.h>
 
-void pinMode(uint8 pin, WiringPinMode mode) {
-    gpio_pin_mode outputMode;
-    bool pwm = false;
-
-    if (pin >= BOARD_NR_GPIO_PINS) {
-        return;
-    }
-
-    switch(mode) {
-    case OUTPUT:
-        outputMode = GPIO_OUTPUT_PP;
-        break;
-    case OUTPUT_OPEN_DRAIN:
-        outputMode = GPIO_OUTPUT_OD;
-        break;
-    case INPUT:
-    case INPUT_FLOATING:
-        outputMode = GPIO_INPUT_FLOATING;
-        break;
-    case INPUT_ANALOG:
-        outputMode = GPIO_INPUT_ANALOG;
-        break;
-    case INPUT_PULLUP:
-        outputMode = GPIO_INPUT_PU;
-        break;
-    case INPUT_PULLDOWN:
-        outputMode = GPIO_INPUT_PD;
-        break;
-    case PWM:
-        outputMode = GPIO_AF_OUTPUT_PP;
-        pwm = true;
-        break;
-    case PWM_OPEN_DRAIN:
-        outputMode = GPIO_AF_OUTPUT_OD;
-        pwm = true;
-        break;
-    default:
-        ASSERT(0);
-        return;
-    }
-
-    gpio_set_mode(PIN_MAP[pin].gpio_device, PIN_MAP[pin].gpio_bit, outputMode);
-
-    if (PIN_MAP[pin].timer_device != NULL) {
-        /* Enable/disable timer channels if we're switching into or
-         * out of PWM. */
-        timer_set_mode(PIN_MAP[pin].timer_device,
-                       PIN_MAP[pin].timer_channel,
-                       pwm ? TIMER_PWM : TIMER_DISABLED);
-    }
-}
-
-
 uint32 digitalRead(uint8 pin) {
     if (pin >= BOARD_NR_GPIO_PINS) {
         return 0;