Bring back EXTI on F1, with deprecations for gpio.h on F1.

Tested on Maple Mini with examples/mini-exti-test. Changes to Wirish
are minor: use the new EXTI types exti_num and exti_cfg (see below) in
place of now-deprecated variants in ext_interrupts.cpp.

The way I originally did libmaple/exti.h was stupid, and fixing it
turned out to be a little disruptive.

libmaple/exti.h depends on libmaple/gpio.h (for AFIO), but that's a
classic case of exposed implementation detail. So invert the
dependency: make gpio.h depend on exti.h. Do this by adding exti_num
and exti_cfg to exti.h; these respectively replace afio_exti_num and
afio_exti_port. The afio_* variants are now deprecated. (Throw in a
typedef and some macros at the bottom of the F1 series/gpio.h for
backwards compatibility).

Make exti_attach_interrupt() and exti_detach_interrupt() take
exti_num/exti_cfg arguments instead of the afio_* variants.

Make the EXTI dispatch routines __always_inline to defeat GCC -Os.

Many renames throughout libmaple/stm32f1/ to stop using the deprecated
names. Also move the previously F1-only gpio_exti_port() function into
the public libmaple header. Reimplementing it in terms of rcc_clk_ids
lets us deprecate the gpio_dev->exti_port field, which will save space
in the future.

While we're there, I notice that struct gpio_dev is defined once per
series. That's dumb, as it misses the entire point of having device
structs: they contain what's portable. So put the F1 version (which
has the extra EXTI port field) into libmaple/gpio.h, and add the
necessary exti_ports to libmaple/stm32f2/gpio.c. Sigh. We'll get rid
of it eventually, at least.

Clean up some other mistakes in gpio.h files as well (mostly removing
util.h dependency). Sorry for the messy commit.

For portability, add a new series-specific exti function,
exti_select(). The F1 version in (new) libmaple/stm32f1/exti.c uses
AFIO and some new private functionality in libmaple/exti.c and (new)
libmaple/exti_private.h to make this convenient.  We'll be able to do
the SYSCFG equivalent on F2 without any trouble.

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

1 files changed, 9 insertions, 27 deletions

diff --git a/libmaple/stm32f1/gpio.c b/libmaple/stm32f1/gpio.c
index 2cbe299..4b596e9 100644
--- a/libmaple/stm32f1/gpio.c
+++ b/libmaple/stm32f1/gpio.c
@@ -39,7 +39,7 @@
 gpio_dev gpioa = {
     .regs      = GPIOA_BASE,
     .clk_id    = RCC_GPIOA,
-    .exti_port = AFIO_EXTI_PA,
+    .exti_port = EXTI_PA,
 };
 /** GPIO port A device. */
 gpio_dev* const GPIOA = &gpioa;
@@ -47,7 +47,7 @@ gpio_dev* const GPIOA = &gpioa;
 gpio_dev gpiob = {
     .regs      = GPIOB_BASE,
     .clk_id    = RCC_GPIOB,
-    .exti_port = AFIO_EXTI_PB,
+    .exti_port = EXTI_PB,
 };
 /** GPIO port B device. */
 gpio_dev* const GPIOB = &gpiob;
@@ -55,7 +55,7 @@ gpio_dev* const GPIOB = &gpiob;
 gpio_dev gpioc = {
     .regs      = GPIOC_BASE,
     .clk_id    = RCC_GPIOC,
-    .exti_port = AFIO_EXTI_PC,
+    .exti_port = EXTI_PC,
 };
 /** GPIO port C device. */
 gpio_dev* const GPIOC = &gpioc;
@@ -63,7 +63,7 @@ gpio_dev* const GPIOC = &gpioc;
 gpio_dev gpiod = {
     .regs      = GPIOD_BASE,
     .clk_id    = RCC_GPIOD,
-    .exti_port = AFIO_EXTI_PD,
+    .exti_port = EXTI_PD,
 };
 /** GPIO port D device. */
 gpio_dev* const GPIOD = &gpiod;
@@ -72,7 +72,7 @@ gpio_dev* const GPIOD = &gpiod;
 gpio_dev gpioe = {
     .regs      = GPIOE_BASE,
     .clk_id    = RCC_GPIOE,
-    .exti_port = AFIO_EXTI_PE,
+    .exti_port = EXTI_PE,
 };
 /** GPIO port E device. */
 gpio_dev* const GPIOE = &gpioe;
@@ -80,7 +80,7 @@ gpio_dev* const GPIOE = &gpioe;
 gpio_dev gpiof = {
     .regs      = GPIOF_BASE,
     .clk_id    = RCC_GPIOF,
-    .exti_port = AFIO_EXTI_PF,
+    .exti_port = EXTI_PF,
 };
 /** GPIO port F device. */
 gpio_dev* const GPIOF = &gpiof;
@@ -88,7 +88,7 @@ gpio_dev* const GPIOF = &gpiof;
 gpio_dev gpiog = {
     .regs      = GPIOG_BASE,
     .clk_id    = RCC_GPIOG,
-    .exti_port = AFIO_EXTI_PG,
+    .exti_port = EXTI_PG,
 };
 /** GPIO port G device. */
 gpio_dev* const GPIOG = &gpiog;
@@ -132,9 +132,9 @@ void gpio_set_mode(gpio_dev *dev, uint8 pin, gpio_pin_mode mode) {
     *cr = tmp;
 
     if (mode == GPIO_INPUT_PD) {
-        regs->ODR &= ~BIT(pin);
+        regs->ODR &= ~(1U << pin);
     } else if (mode == GPIO_INPUT_PU) {
-        regs->ODR |= BIT(pin);
+        regs->ODR |= (1U << pin);
     }
 }
 
@@ -153,24 +153,6 @@ void afio_init(void) {
 #define AFIO_EXTI_SEL_MASK 0xF
 
 /**
- * @brief Select a source input for an external interrupt.
- *
- * @param exti      External interrupt.
- * @param gpio_port Port which contains pin to use as source input.
- * @see afio_exti_num
- * @see afio_exti_port
- */
-void afio_exti_select(afio_exti_num exti, afio_exti_port gpio_port) {
-    __io uint32 *exti_cr = &AFIO_BASE->EXTICR1 + exti / 4;
-    uint32 shift = 4 * (exti % 4);
-    uint32 cr = *exti_cr;
-
-    cr &= ~(AFIO_EXTI_SEL_MASK << shift);
-    cr |= gpio_port << shift;
-    *exti_cr = cr;
-}
-
-/**
  * @brief Perform an alternate function remap.
  * @param remapping Remapping to perform.
  */