diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-22 09:16:32 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-22 09:16:32 +0200 |
| commit | cb862233badf378aff6c2fe9b55774401b5a79d4 (patch) | |
| tree | ee0ee81550d863544e4b4b7b5fb428d44f86bf2a | |
| parent | 088146b90eee5b614ea6386a64dae343a49a5172 (diff) | |
| parent | 41fffa0df192e4a26d2325c7ac5d9b5d7ba0211c (diff) | |
| download | nuttx-cb862233badf378aff6c2fe9b55774401b5a79d4.tar.gz nuttx-cb862233badf378aff6c2fe9b55774401b5a79d4.tar.bz2 nuttx-cb862233badf378aff6c2fe9b55774401b5a79d4.zip | |
Merge pull request #21 from PX4/irqprio
Add "#ifdef CONFIG_ARCH_IRQPRIO" where needed
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_otgfsdev.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_sdio.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c index b8033fdd5..10fdc75bb 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c @@ -5435,9 +5435,11 @@ void up_usbinitialize(void) up_enable_irq(STM32_IRQ_OTGFS); +#ifdef CONFIG_ARCH_IRQPRIO /* Set the interrrupt priority */ up_prioritize_irq(STM32_IRQ_OTGFS, CONFIG_OTGFS_PRI); +#endif return; errout: diff --git a/nuttx/arch/arm/src/stm32/stm32_sdio.c b/nuttx/arch/arm/src/stm32/stm32_sdio.c index 7a351a9de..01663d0a5 100644 --- a/nuttx/arch/arm/src/stm32/stm32_sdio.c +++ b/nuttx/arch/arm/src/stm32/stm32_sdio.c @@ -1664,9 +1664,11 @@ static int stm32_attach(FAR struct sdio_dev_s *dev) up_enable_irq(STM32_IRQ_SDIO); +#ifdef CONFIG_ARCH_IRQPRIO /* Set the interrrupt priority */ up_prioritize_irq(STM32_IRQ_SDIO, CONFIG_SDIO_PRI); +#endif } return ret; diff --git a/nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c b/nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c index e25138945..13a87c970 100644 --- a/nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c +++ b/nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c @@ -359,9 +359,11 @@ void weak_function up_dmainitialize(void) up_enable_irq(dmach->irq); +#ifdef CONFIG_ARCH_IRQPRIO /* Set the interrrupt priority */ up_prioritize_irq(dmach->irq, CONFIG_DMA_PRI); +#endif } } diff --git a/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c b/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c index 52382cf5b..73edc1364 100644 --- a/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c +++ b/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c @@ -492,9 +492,11 @@ void weak_function up_dmainitialize(void) up_enable_irq(dmast->irq); +#ifdef CONFIG_ARCH_IRQPRIO /* Set the interrrupt priority */ up_prioritize_irq(dmast->irq, CONFIG_DMA_PRI); +#endif } } |