diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-15 22:29:45 -0500 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-16 01:17:21 -0500 |
commit | 2764748208816043a3149eae3a433d02325a1a36 (patch) | |
tree | cc5afb0af0c6f1d2282db08d3dad1dae9b4d33e6 /libmaple/exti.c | |
parent | 1fb0e0d727089e23d4b30e1efba5410dc4b4da14 (diff) | |
parent | 620740bf1986311041a40bd2992d1b549f84b2ba (diff) | |
download | librambutan-2764748208816043a3149eae3a433d02325a1a36.tar.gz librambutan-2764748208816043a3149eae3a433d02325a1a36.zip |
Merge branch 'nzmichaelh-master' into master.
This provides DMA, IWDG, PWR, and BKP support, and fixes several bugs.
Conflicts:
libmaple/adc.h
libmaple/libmaple.h
libmaple/ring_buffer.h
Diffstat (limited to 'libmaple/exti.c')
-rw-r--r-- | libmaple/exti.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmaple/exti.c b/libmaple/exti.c index 496f0a1..150dd05 100644 --- a/libmaple/exti.c +++ b/libmaple/exti.c @@ -180,11 +180,11 @@ void exti_attach_interrupt(uint32 port, break; } - /* Configure the enable interrupt bits for the NVIC */ - nvic_irq_enable(exti_channels[channel].irq_line); - /* Register the handler */ exti_channels[channel].handler = handler; + + /* Configure the enable interrupt bits for the NVIC */ + nvic_irq_enable(exti_channels[channel].irq_line); } |