aboutsummaryrefslogtreecommitdiffstats
path: root/wirish/ext_interrupts.cpp
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-03-25 20:09:30 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-03-25 20:09:30 -0400
commitf8081eeb04c9cb511adaf58e201c7cfbe1ddfbd4 (patch)
treea4de9665dd2d2340820b888c47e252c233ff9421 /wirish/ext_interrupts.cpp
parent63ea7464925b8cbeb8623d08a2bde0b1d2044047 (diff)
downloadlibrambutan-f8081eeb04c9cb511adaf58e201c7cfbe1ddfbd4.tar.gz
librambutan-f8081eeb04c9cb511adaf58e201c7cfbe1ddfbd4.zip
Final stm32_pin_info design candidate; ADC3 support on Native.
Added an adc_dev to struct stm32_pin_info. This was necessary to add support for the channels on the Native which are only connected to ADC3, but it does add a bunch of NULLs to the PIN_MAPs. I don't think any other peripherals need representation on a per-pin basis. Each peripheral library will be responsible for keeping track of related GPIO ports and bits, and we can throw #defines in to boards/*.h for other things (e.g. BOARD_SPI1_MISO_PIN). Fleshed out the ADC refactor and brought it more in keeping with the new design as it evolves. A couple of other tweaks. Notably: waitForButtonPress() now takes a default argument meaning "wait forever". Removed Maple-specific documentation from core functions in io.h; this information will need to go into the individual board docs files.
Diffstat (limited to 'wirish/ext_interrupts.cpp')
-rw-r--r--wirish/ext_interrupts.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/wirish/ext_interrupts.cpp b/wirish/ext_interrupts.cpp
index 060994f..f9ccd39 100644
--- a/wirish/ext_interrupts.cpp
+++ b/wirish/ext_interrupts.cpp
@@ -49,7 +49,7 @@ void attachInterrupt(uint8 pin, voidFuncPtr handler, ExtIntTriggerMode mode) {
exti_trigger_mode outMode = exti_out_mode(mode);
- exti_attach_interrupt((afio_exti_num)(PIN_MAP[pin].gpio_pin),
+ exti_attach_interrupt((afio_exti_num)(PIN_MAP[pin].gpio_bit),
gpio_exti_port(PIN_MAP[pin].gpio_device),
handler,
outMode);
@@ -64,7 +64,7 @@ void detachInterrupt(uint8 pin) {
return;
}
- exti_detach_interrupt((afio_exti_num)(PIN_MAP[pin].gpio_pin));
+ exti_detach_interrupt((afio_exti_num)(PIN_MAP[pin].gpio_bit));
}
static inline exti_trigger_mode exti_out_mode(ExtIntTriggerMode mode) {