diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-05-20 17:48:39 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-05-20 17:48:39 -0600 |
| commit | ab4d04d81f8bb7f067190493b0e69a92f9e1a21d (patch) | |
| tree | 7cf766fc04ff15d61235d40b1be876762d813874 /nuttx/arch/arm/src/kinetis | |
| parent | e83378539e90cc6ad05140b38fe35d5f447b54ee (diff) | |
| download | nuttx-ab4d04d81f8bb7f067190493b0e69a92f9e1a21d.tar.gz nuttx-ab4d04d81f8bb7f067190493b0e69a92f9e1a21d.tar.bz2 nuttx-ab4d04d81f8bb7f067190493b0e69a92f9e1a21d.zip | |
Make sure that all references to up_prioritize_irq() are conditioned on CONFIG_ARCH_IRQPRIO. Noted by Make Smith
Diffstat (limited to 'nuttx/arch/arm/src/kinetis')
| -rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_enet.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_sdhc.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_serial.c | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c index eb277f162..2607b6bdf 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c @@ -1465,12 +1465,14 @@ int kinetis_netinitialize(int intf) kinetis_pinconfig(PIN_RMII0_TXEN); #endif +#ifdef CONFIG_ARCH_IRQPRIO /* Set interrupt priority levels */ up_prioritize_irq(KINETIS_IRQ_EMACTMR, CONFIG_KINETIS_EMACTMR_PRIO); up_prioritize_irq(KINETIS_IRQ_EMACTX, CONFIG_KINETIS_EMACTX_PRIO); up_prioritize_irq(KINETIS_IRQ_EMACRX, CONFIG_KINETIS_EMACRX_PRIO); up_prioritize_irq(KINETIS_IRQ_EMACMISC, CONFIG_KINETIS_EMACMISC_PRIO); +#endif /* Attach the Ethernet MAC IEEE 1588 timer interrupt handler */ diff --git a/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c b/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c index cf2109130..3ba8c4299 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c @@ -1688,9 +1688,11 @@ static int kinetis_attach(FAR struct sdio_dev_s *dev) putreg32(0, KINETIS_SDHC_IRQSIGEN); putreg32(SDHC_INT_ALL, KINETIS_SDHC_IRQSTAT); +#ifdef CONFIG_ARCH_IRQPRIO /* Set the interrupt priority */ up_prioritize_irq(KINETIS_IRQ_SDHC, CONFIG_KINETIS_SDHC_PRIO); +#endif /* Enable SDIO interrupts at the NVIC. They can now be enabled at * the SDIO controller as needed. diff --git a/nuttx/arch/arm/src/kinetis/kinetis_serial.c b/nuttx/arch/arm/src/kinetis/kinetis_serial.c index 5446ffe80..0df9b88ab 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_serial.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_serial.c @@ -623,12 +623,15 @@ static int up_setup(struct uart_dev_s *dev) up_restoreuartint(priv, 0); +#ifdef CONFIG_ARCH_IRQPRIO /* Set up the interrupt priority */ up_prioritize_irq(priv->irqs, priv->irqprio); #ifdef CONFIG_DEBUG up_prioritize_irq(priv->irqe, priv->irqprio); #endif +#endif + return OK; } |