Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-23 14:58:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

arch/arm/src/kinetis: Remove all attempts to reprioritize interrupts.

Browse Source
This commit is contained in:
Gregory Nutt
2018-09-21 13:18:29 -06:00
parent 2c0a0aef9f
commit 6632ac721e
8 changed files with 0 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/kinetis/kinetis_config.h
-51
View File
@@ -335,42 +335,6 @@
#undef CONFIG_KINETIS_UARTFIFOS
/* UART Default Interrupt Priorities */
#ifndef CONFIG_KINETIS_UART0PRIO
# define CONFIG_KINETIS_UART0PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_UART1PRIO
# define CONFIG_KINETIS_UART1PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_UART2PRIO
# define CONFIG_KINETIS_UART2PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_UART3PRIO
# define CONFIG_KINETIS_UART3PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_UART4PRIO
# define CONFIG_KINETIS_UART4PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_UART5PRIO
# define CONFIG_KINETIS_UART5PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_LPUART0PRIO
# define CONFIG_KINETIS_LPUART0PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_LPUART1PRIO
# define CONFIG_KINETIS_LPUART1PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_LPUART2PRIO
# define CONFIG_KINETIS_LPUART2PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_LPUART3PRIO
# define CONFIG_KINETIS_LPUART3PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_LPUART4PRIO
# define CONFIG_KINETIS_LPUART4PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
/* Ethernet controller configuration */
#ifndef CONFIG_ENET_NRXBUFFERS
@@ -388,21 +352,6 @@
# define CONFIG_ENETNETHIFS 1
#endif
/* EMAC Default Interrupt Priorities */
#ifndef CONFIG_KINETIS_EMACTMR_PRIO
# define CONFIG_KINETIS_EMACTMR_PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_EMACTX_PRIO
# define CONFIG_KINETIS_EMACTX_PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_EMACRX_PRIO
# define CONFIG_KINETIS_EMACRX_PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_KINETIS_EMACMISC_PRIO
# define CONFIG_KINETIS_EMACMISC_PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
/************************************************************************************
* Public Types
************************************************************************************/
arch/arm/src/kinetis/kinetis_dma.c
-10
View File
@@ -69,10 +69,6 @@
# define DMA_CHN_PER_GROUP KINETIS_NDMACH /* Number of channels per group */
#endif
#ifndef CONFIG_DMA_PRI
# define CONFIG_DMA_PRI NVIC_SYSH_PRIORITY_DEFAULT
#endif
/****************************************************************************
* Private Types
****************************************************************************/
@@ -178,12 +174,6 @@ void weak_function up_dmainitialize(void)
if (i < DMA_CHN_PER_GROUP)
{
#ifdef CONFIG_ARCH_IRQPRIO
/* Set up the interrupt priority */
up_prioritize_irq(g_channels[i].irq, CONFIG_DMA_PRI);
#endif
/* Attach DMA interrupt */
ret = irq_attach(g_channels[i].irq, kinetis_dmainterrupt,
arch/arm/src/kinetis/kinetis_enet.c
-9
View File
@@ -2075,15 +2075,6 @@ 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 */
#if 0
arch/arm/src/kinetis/kinetis_irq.c
-3
View File
@@ -403,9 +403,6 @@ void up_irqinitialize(void)
/* Set the priority of the SVCall interrupt */
#ifdef CONFIG_ARCH_IRQPRIO
/* up_prioritize_irq(KINETIS_IRQ_PENDSV, NVIC_SYSH_PRIORITY_MIN); */
#endif
#ifdef CONFIG_ARMV7M_USEBASEPRI
kinetis_prioritize_syscall(NVIC_SYSH_SVCALL_PRIORITY);
#endif
arch/arm/src/kinetis/kinetis_lpserial.c
-13
View File
@@ -222,7 +222,6 @@ struct kinetis_dev_s
uint32_t clock; /* Clocking frequency of the LPUART module */
uint32_t ie; /* Interrupts enabled */
uint8_t irq; /* IRQ associated with this LPUART (for enable) */
uint8_t irqprio; /* Interrupt priority */
uint8_t parity; /* 0=none, 1=odd, 2=even */
uint8_t bits; /* Number of bits (8 or 9) */
uint8_t stop2; /* Use 2 stop bits */
@@ -316,7 +315,6 @@ static struct kinetis_dev_s g_lpuart0priv =
.clock = BOARD_LPUART0_FREQ,
.baud = CONFIG_LPUART0_BAUD,
.irq = KINETIS_IRQ_LPUART0,
.irqprio = CONFIG_KINETIS_LPUART0PRIO,
.parity = CONFIG_LPUART0_PARITY,
.bits = CONFIG_LPUART0_BITS,
.stop2 = CONFIG_LPUART0_2STOP,
@@ -356,7 +354,6 @@ static struct kinetis_dev_s g_lpuart1priv =
.clock = BOARD_CORECLK_FREQ,
.baud = BOARD_LPUART1_FREQ,
.irq = KINETIS_IRQ_LPUART1,
.irqprio = CONFIG_KINETIS_LPUART1PRIO,
.parity = CONFIG_LPUART1_PARITY,
.bits = CONFIG_LPUART1_BITS,
.stop2 = CONFIG_LPUART1_2STOP,
@@ -396,7 +393,6 @@ static struct kinetis_dev_s g_lpuart2priv =
.clock = BOARD_CORECLK_FREQ,
.baud = BOARD_LPUART2_FREQ,
.irq = KINETIS_IRQ_LPUART2,
.irqprio = CONFIG_KINETIS_LPUART2PRIO,
.parity = CONFIG_LPUART2_PARITY,
.bits = CONFIG_LPUART2_BITS,
.stop2 = CONFIG_LPUART2_2STOP,
@@ -436,7 +432,6 @@ static struct kinetis_dev_s g_lpuart3priv =
.clock = BOARD_CORECLK_FREQ,
.baud = BOARD_LPUART3_FREQ,
.irq = KINETIS_IRQ_LPUART3,
.irqprio = CONFIG_KINETIS_LPUART3PRIO,
.parity = CONFIG_LPUART3_PARITY,
.bits = CONFIG_LPUART3_BITS,
.stop2 = CONFIG_LPUART3_2STOP,
@@ -476,7 +471,6 @@ static struct kinetis_dev_s g_lpuart4priv =
.clock = BOARD_CORECLK_FREQ,
.baud = BOARD_LPUART4_FREQ,
.irq = KINETIS_IRQ_LPUART4,
.irqprio = CONFIG_KINETIS_LPUART4PRIO,
.parity = CONFIG_LPUART4_PARITY,
.bits = CONFIG_LPUART4_BITS,
.stop2 = CONFIG_LPUART4_2STOP,
@@ -620,13 +614,6 @@ static int kinetis_setup(struct uart_dev_s *dev)
/* Make sure that all interrupts are disabled */
kinetis_restoreuartint(priv, 0);
#ifdef CONFIG_ARCH_IRQPRIO
/* Set up the interrupt priority */
up_prioritize_irq(priv->irq, priv->irqprio);
#endif
return OK;
}
arch/arm/src/kinetis/kinetis_sdhc.c
-10
View File
@@ -84,10 +84,6 @@
# error "Callback support requires CONFIG_SCHED_WORKQUEUE and CONFIG_SCHED_HPWORK"
#endif
#ifndef CONFIG_KINETIS_SDHC_PRIO
# define CONFIG_KINETIS_SDHC_PRIO NVIC_SYSH_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_DEBUG_MEMCARD_INFO
# undef CONFIG_SDIO_XFRDEBUG
#endif
@@ -1717,12 +1713,6 @@ 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.
*/
arch/arm/src/kinetis/kinetis_serial.c
-17
View File
@@ -305,7 +305,6 @@ struct up_dev_s
uint8_t irqe; /* Error IRQ associated with this UART (for enable) */
#endif
uint8_t irqs; /* Status IRQ associated with this UART (for enable) */
uint8_t irqprio; /* Interrupt priority */
uint8_t ie; /* Interrupts enabled */
uint8_t parity; /* 0=none, 1=odd, 2=even */
uint8_t bits; /* Number of bits (8 or 9) */
@@ -490,7 +489,6 @@ static struct up_dev_s g_uart0priv =
.irqe = KINETIS_IRQ_UART0E,
#endif
.irqs = KINETIS_IRQ_UART0S,
.irqprio = CONFIG_KINETIS_UART0PRIO,
.parity = CONFIG_UART0_PARITY,
.bits = CONFIG_UART0_BITS,
.stop2 = CONFIG_UART0_2STOP,
@@ -542,7 +540,6 @@ static struct up_dev_s g_uart1priv =
.irqe = KINETIS_IRQ_UART1E,
#endif
.irqs = KINETIS_IRQ_UART1S,
.irqprio = CONFIG_KINETIS_UART1PRIO,
.parity = CONFIG_UART1_PARITY,
.bits = CONFIG_UART1_BITS,
.stop2 = CONFIG_UART1_2STOP,
@@ -593,7 +590,6 @@ static struct up_dev_s g_uart2priv =
.irqe = KINETIS_IRQ_UART2E,
#endif
.irqs = KINETIS_IRQ_UART2S,
.irqprio = CONFIG_KINETIS_UART2PRIO,
.parity = CONFIG_UART2_PARITY,
.bits = CONFIG_UART2_BITS,
.stop2 = CONFIG_UART2_2STOP,
@@ -644,7 +640,6 @@ static struct up_dev_s g_uart3priv =
.irqe = KINETIS_IRQ_UART3E,
#endif
.irqs = KINETIS_IRQ_UART3S,
.irqprio = CONFIG_KINETIS_UART3PRIO,
.parity = CONFIG_UART3_PARITY,
.bits = CONFIG_UART3_BITS,
.stop2 = CONFIG_UART3_2STOP,
@@ -695,7 +690,6 @@ static struct up_dev_s g_uart4priv =
.irqe = KINETIS_IRQ_UART4E,
#endif
.irqs = KINETIS_IRQ_UART4S,
.irqprio = CONFIG_KINETIS_UART4PRIO,
.parity = CONFIG_UART4_PARITY,
.bits = CONFIG_UART4_BITS,
.stop2 = CONFIG_UART4_2STOP,
@@ -746,7 +740,6 @@ static struct up_dev_s g_uart5priv =
.irqe = KINETIS_IRQ_UART5E,
#endif
.irqs = KINETIS_IRQ_UART5S,
.irqprio = CONFIG_KINETIS_UART5PRIO,
.parity = CONFIG_UART5_PARITY,
.bits = CONFIG_UART5_BITS,
.stop2 = CONFIG_UART5_2STOP,
@@ -930,16 +923,6 @@ static int up_setup(struct uart_dev_s *dev)
/* Make sure that all interrupts are disabled */
up_restoreuartint(priv, 0);
#ifdef CONFIG_ARCH_IRQPRIO
/* Set up the interrupt priority */
up_prioritize_irq(priv->irqs, priv->irqprio);
#ifdef CONFIG_DEBUG_FEATURES
up_prioritize_irq(priv->irqe, priv->irqprio);
#endif
#endif
return OK;
}
arch/arm/src/kinetis/kinetis_usbdev.c
-6
View File
@@ -4404,12 +4404,6 @@ void up_usbinitialize(void)
return;
}
#ifdef CONFIG_ARCH_IRQPRIO
/* Set the interrupt priority */
up_prioritize_irq(KINETIS_IRQ_USBOTG, 112);
#endif
khci_hwinitalize(priv);
}