diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-06-20 13:23:44 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-06-20 15:22:03 -0400 |
| commit | 7b95d3277074468dd1d22c21c4f558d04c2f7247 (patch) | |
| tree | 4d4c4c52a79bafa851d486743b2d40aaea6a2240 /support | |
| parent | 4e54793e14cac03990e15026fd962ec495b464d0 (diff) | |
| download | librambutan-7b95d3277074468dd1d22c21c4f558d04c2f7247.tar.gz librambutan-7b95d3277074468dd1d22c21c4f558d04c2f7247.zip | |
DMA: Fix non-working DMA interrupts.
libmaple/dma.c defines DMA interrupts __irq_dma_channel[1-7],
consistent with what is specified by support/ld/names.inc. However,
names.inc is inconsistent with what support/ld/libcs3_stm32_src/
expects. Specifically, it contradicts the files
- support/ld/libcs3_stm32_src/stm32_isrs.S
- support/ld/libcs3_stm32_src/stm32_vector_table.S
Which use the names __irq_dma1_channel[1-7].
Change names.inc and dma.c to use the correct IRQ names.
The original names.inc/libcs3_stm32_src inconsistency was introduced
in 43d6921658cd29b8022af4424d340a90fbcb9a7f, but dma.c had the correct
names until ec3cf2903f4b03bc1dae5e159495c9e5ef0938ca, where they were
renamed for consistency with names.inc. At that point, DMA interrupts
stopped working. (This was documented in the commit message).
Thanks to forum user robodude666 for tracking this down.
Diffstat (limited to 'support')
| -rw-r--r-- | support/ld/names.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/support/ld/names.inc b/support/ld/names.inc index 4045836..6d7ff6e 100644 --- a/support/ld/names.inc +++ b/support/ld/names.inc @@ -26,13 +26,13 @@ EXTERN(__irq_exti1) EXTERN(__irq_exti2) EXTERN(__irq_exti3) EXTERN(__irq_exti4) -EXTERN(__irq_dma_channel1) -EXTERN(__irq_dma_channel2) -EXTERN(__irq_dma_channel3) -EXTERN(__irq_dma_channel4) -EXTERN(__irq_dma_channel5) -EXTERN(__irq_dma_channel6) -EXTERN(__irq_dma_channel7) +EXTERN(__irq_dma1_channel1) +EXTERN(__irq_dma1_channel2) +EXTERN(__irq_dma1_channel3) +EXTERN(__irq_dma1_channel4) +EXTERN(__irq_dma1_channel5) +EXTERN(__irq_dma1_channel6) +EXTERN(__irq_dma1_channel7) EXTERN(__irq_adc) EXTERN(__irq_usb_hp_can_tx) EXTERN(__irq_usb_lp_can_rx0) |