Merge pull request #21 from PX4/irqprio

Add "#ifdef CONFIG_ARCH_IRQPRIO" where needed
ArduPilot · Aug 22, 2014 · cb86223 · cb86223
2 parents 088146b + 41fffa0
commit cb86223
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
     }
 }