michaelh/zephyr
1
0
Fork 0
Code Releases Activity

irq: removes priority parameter from IRQ_CONFIG macro

Browse source 
Removes the 'priority' parameter from the IRQ_CONFIG macro.
This parameter was not used anymore in any architecture.
The priority is handled in the IRQ_CONNECT macro.
The documentation is updated as well.

Change-Id: I24a293c5e41bd729d5e759113e0c4a8a6a61e0dd
Signed-off-by: Juan Manuel Cruz <juan.m.cruz.alcaraz@linux.intel.com>
This commit is contained in:
Juan Manuel Cruz 2015-11-30 11:21:13 -06:00 • committed by Anas Nashif
commit bc1a79c4c3
21 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/arc/platforms/quark_se_ss/platform_config.c
View file

@ -27,8 +27,7 @@ IRQ_CONNECT_STATIC(quark_se_ipi, QUARK_SE_IPI_INTERRUPT,
static int arc_quark_se_ipi_init(void) static int arc_quark_se_ipi_init(void)
{ {
IRQ_CONFIG(quark_se_ipi, QUARK_SE_IPI_INTERRUPT, IRQ_CONFIG(quark_se_ipi, QUARK_SE_IPI_INTERRUPT);
QUARK_SE_IPI_INTERRUPT_PRI);
irq_enable(QUARK_SE_IPI_INTERRUPT); irq_enable(QUARK_SE_IPI_INTERRUPT);
return DEV_OK; return DEV_OK;
} }

2
arch/x86/platforms/quark_se/quark_se_config.c
View file

@ -32,7 +32,7 @@ IRQ_CONNECT_STATIC(quark_se_ipi, QUARK_SE_IPI_INTERRUPT, QUARK_SE_IPI_INTERRUPT_
static int x86_quark_se_ipi_init(void) static int x86_quark_se_ipi_init(void)
{ {
IRQ_CONFIG(quark_se_ipi, QUARK_SE_IPI_INTERRUPT, 0); IRQ_CONFIG(quark_se_ipi, QUARK_SE_IPI_INTERRUPT);
irq_enable(QUARK_SE_IPI_INTERRUPT); irq_enable(QUARK_SE_IPI_INTERRUPT);
return DEV_OK; return DEV_OK;
} }

2
doc/kernel/nanokernel/nanokernel_interrupts.rst
View file

@ -109,7 +109,7 @@ Example
void my_isr_installer(void) void my_isr_installer(void)
{ {
... ...
IRQ_CONFIG(my_dev, MY_DEV_IRQ, 0); /* finish IRQ configuration */ IRQ_CONFIG(my_dev, MY_DEV_IRQ); /* finish IRQ configuration */
irq_enable(MY_DEV_IRQ); /* enable IRQ */ irq_enable(MY_DEV_IRQ); /* enable IRQ */
... ...
} }

4
drivers/adc/adc_dw.c
View file

@ -338,9 +338,9 @@ static void adc_config_0_irq(struct device *dev)
{ {
struct adc_config *config = dev->config->config_info; struct adc_config *config = dev->config->config_info;
IRQ_CONFIG(adc_dw_0_rx, IO_ADC0_INT_IRQ, 0); IRQ_CONFIG(adc_dw_0_rx, IO_ADC0_INT_IRQ);
irq_enable(config->rx_vector); irq_enable(config->rx_vector);
IRQ_CONFIG(adc_dw_0_err, IO_ADC0_INT_ERR, 0); IRQ_CONFIG(adc_dw_0_err, IO_ADC0_INT_ERR);
irq_enable(config->err_vector); irq_enable(config->err_vector);
} }
#endif #endif

2
drivers/aio/aio_dw_comparator.c
View file

@ -29,7 +29,7 @@ static int dw_aio_cmp_config(struct device *dev)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
IRQ_CONFIG(dw_aio_cmp, INT_AIO_CMP_IRQ, 0); IRQ_CONFIG(dw_aio_cmp, INT_AIO_CMP_IRQ);
return DEV_OK; return DEV_OK;
} }

2
drivers/bluetooth/uart.c
View file

@ -231,7 +231,7 @@ static void bt_uart_setup(struct device *uart)
uart_irq_rx_disable(uart); uart_irq_rx_disable(uart);
uart_irq_tx_disable(uart); uart_irq_tx_disable(uart);
IRQ_CONFIG(bluetooth, uart_irq_get(uart), 0); IRQ_CONFIG(bluetooth, uart_irq_get(uart));
irq_enable(uart_irq_get(uart)); irq_enable(uart_irq_get(uart));
/* Drain the fifo */ /* Drain the fifo */

2
drivers/console/uart_console.c
View file

@ -180,7 +180,7 @@ static void console_input_init(void)
uart_irq_rx_disable(uart_console_dev); uart_irq_rx_disable(uart_console_dev);
uart_irq_tx_disable(uart_console_dev); uart_irq_tx_disable(uart_console_dev);
IRQ_CONFIG(console, uart_irq_get(uart_console_dev), 0); IRQ_CONFIG(console, uart_irq_get(uart_console_dev));
irq_enable(uart_irq_get(uart_console_dev)); irq_enable(uart_irq_get(uart_console_dev));
/* Drain the fifo */ /* Drain the fifo */

2
drivers/console/uart_pipe.c
View file

@ -80,7 +80,7 @@ static void uart_pipe_setup(struct device *uart)
{ {
uart_irq_rx_disable(uart); uart_irq_rx_disable(uart);
uart_irq_tx_disable(uart); uart_irq_tx_disable(uart);
IRQ_CONFIG(uart_pipe, uart_irq_get(uart), 0); IRQ_CONFIG(uart_pipe, uart_irq_get(uart));
irq_enable(uart_irq_get(uart)); irq_enable(uart_irq_get(uart));
/* Drain the fifo */ /* Drain the fifo */

2
drivers/ethernet/eth_dw.c
View file

@ -325,7 +325,7 @@ static void eth_config_0_irq(struct device *port)
#ifdef CONFIG_ETH_DW_0_IRQ_DIRECT #ifdef CONFIG_ETH_DW_0_IRQ_DIRECT
ARG_UNUSED(shared_irq_dev); ARG_UNUSED(shared_irq_dev);
IRQ_CONFIG(eth_dw_0, config->irq_num, 0); IRQ_CONFIG(eth_dw_0, config->irq_num);
irq_enable(config->irq_num); irq_enable(config->irq_num);
#elif defined(CONFIG_ETH_DW_0_IRQ_SHARED) #elif defined(CONFIG_ETH_DW_0_IRQ_SHARED)
shared_irq_dev = device_get_binding(config->shared_irq_dev_name); shared_irq_dev = device_get_binding(config->shared_irq_dev_name);

4
drivers/gpio/gpio_dw.c
View file

@ -456,7 +456,7 @@ void gpio_config_0_irq(struct device *port)
#ifdef CONFIG_GPIO_DW_0_IRQ_DIRECT #ifdef CONFIG_GPIO_DW_0_IRQ_DIRECT
ARG_UNUSED(shared_irq_dev); ARG_UNUSED(shared_irq_dev);
IRQ_CONFIG(gpio_dw_0, config->irq_num, 0); IRQ_CONFIG(gpio_dw_0, config->irq_num);
irq_enable(config->irq_num); irq_enable(config->irq_num);
#elif defined(CONFIG_GPIO_DW_0_IRQ_SHARED) #elif defined(CONFIG_GPIO_DW_0_IRQ_SHARED)
shared_irq_dev = device_get_binding(config->shared_irq_dev_name); shared_irq_dev = device_get_binding(config->shared_irq_dev_name);
@ -520,7 +520,7 @@ void gpio_config_1_irq(struct device *port)
#ifdef CONFIG_GPIO_DW_1_IRQ_DIRECT #ifdef CONFIG_GPIO_DW_1_IRQ_DIRECT
ARG_UNUSED(shared_irq_dev); ARG_UNUSED(shared_irq_dev);
IRQ_CONFIG(gpio_dw_1, config->irq_num, 0); IRQ_CONFIG(gpio_dw_1, config->irq_num);
irq_enable(config->irq_num); irq_enable(config->irq_num);
#elif defined(CONFIG_GPIO_DW_1_IRQ_SHARED) #elif defined(CONFIG_GPIO_DW_1_IRQ_SHARED)
shared_irq_dev = device_get_binding(config->shared_irq_dev_name); shared_irq_dev = device_get_binding(config->shared_irq_dev_name);

4
drivers/i2c/i2c_dw.c
View file

@ -856,7 +856,7 @@ void i2c_config_0(struct device *port)
#if defined(CONFIG_I2C_DW_0_IRQ_DIRECT) #if defined(CONFIG_I2C_DW_0_IRQ_DIRECT)
ARG_UNUSED(shared_irq_dev); ARG_UNUSED(shared_irq_dev);
IRQ_CONFIG(i2c_dw_0, config->irq_num, 0); IRQ_CONFIG(i2c_dw_0, config->irq_num);
irq_enable(config->irq_num); irq_enable(config->irq_num);
#elif defined(CONFIG_I2C_DW_0_IRQ_SHARED) #elif defined(CONFIG_I2C_DW_0_IRQ_SHARED)
ARG_UNUSED(config); ARG_UNUSED(config);
@ -906,7 +906,7 @@ void i2c_config_1(struct device *port)
struct device *shared_irq_dev; struct device *shared_irq_dev;
ARG_UNUSED(shared_irq_dev); ARG_UNUSED(shared_irq_dev);
IRQ_CONFIG(i2c_dw_1, config->irq_num, 0); IRQ_CONFIG(i2c_dw_1, config->irq_num);
irq_enable(config->irq_num); irq_enable(config->irq_num);
} }

2
drivers/rtc/rtc_dw.c
View file

@ -138,7 +138,7 @@ static struct rtc_driver_api funcs = {
int rtc_dw_init(struct device *dev) int rtc_dw_init(struct device *dev)
{ {
IRQ_CONFIG(rtc, INT_RTC_IRQ, 0); IRQ_CONFIG(rtc, INT_RTC_IRQ);
irq_enable(INT_RTC_IRQ); irq_enable(INT_RTC_IRQ);
SCSS_INTERRUPT->int_rtc_mask = INT_UNMASK_IA; SCSS_INTERRUPT->int_rtc_mask = INT_UNMASK_IA;
dev->driver_api = &funcs; dev->driver_api = &funcs;

4
drivers/shared_irq/shared_irq.c
View file

@ -153,7 +153,7 @@ void shared_irq_config_0_irq(struct device *port)
{ {
struct shared_irq_config *config = port->config->config_info; struct shared_irq_config *config = port->config->config_info;
IRQ_CONFIG(shared_irq_0, config->irq_num, 0); IRQ_CONFIG(shared_irq_0, config->irq_num);
} }
void shared_irq_isr_0(void *unused) void shared_irq_isr_0(void *unused)
@ -187,7 +187,7 @@ void shared_irq_config_1_irq(struct device *port)
{ {
struct shared_irq_config *config = port->config->config_info; struct shared_irq_config *config = port->config->config_info;
IRQ_CONFIG(shared_irq_1, config->irq_num, 0); IRQ_CONFIG(shared_irq_1, config->irq_num);
} }
void shared_irq_isr_1(void *unused) void shared_irq_isr_1(void *unused)

4
drivers/spi/dw_spi.c
View file

@ -471,7 +471,7 @@ void spi_config_0_irq(struct device *dev)
{ {
struct spi_dw_config *config = dev->config->config_info; struct spi_dw_config *config = dev->config->config_info;
IRQ_CONFIG(spi_dw_irq_port_0, config->irq, 0); IRQ_CONFIG(spi_dw_irq_port_0, config->irq);
irq_enable(config->irq); irq_enable(config->irq);
} }
@ -507,7 +507,7 @@ void spi_config_1_irq(struct device *dev)
{ {
struct spi_dw_config *config = dev->config->config_info; struct spi_dw_config *config = dev->config->config_info;
IRQ_CONFIG(spi_dw_irq_port_1, config->irq, 0); IRQ_CONFIG(spi_dw_irq_port_1, config->irq);
irq_enable(config->irq); irq_enable(config->irq);
} }

4
drivers/spi/intel_spi.c
View file

@ -468,7 +468,7 @@ void spi_config_0_irq(struct device *dev)
{ {
struct spi_intel_config *config = dev->config->config_info; struct spi_intel_config *config = dev->config->config_info;
IRQ_CONFIG(spi_intel_irq_port_0, config->irq, 0); IRQ_CONFIG(spi_intel_irq_port_0, config->irq);
} }
#endif /* CONFIG_SPI_INTEL_PORT_0 */ #endif /* CONFIG_SPI_INTEL_PORT_0 */
@ -512,7 +512,7 @@ void spi_config_1_irq(struct device *dev)
{ {
struct spi_intel_config *config = dev->config->config_info; struct spi_intel_config *config = dev->config->config_info;
IRQ_CONFIG(spi_intel_irq_port_1, config->irq, 0); IRQ_CONFIG(spi_intel_irq_port_1, config->irq);
} }
#endif /* CONFIG_SPI_INTEL_PORT_1 */ #endif /* CONFIG_SPI_INTEL_PORT_1 */

2
drivers/timer/hpet.c
View file

@ -618,7 +618,7 @@ int _sys_clock_driver_init(struct device *device)
* still has to be programmed into the interrupt controller. * still has to be programmed into the interrupt controller.
*/ */
IRQ_CONFIG(hpet, CONFIG_HPET_TIMER_IRQ, 0); IRQ_CONFIG(hpet, CONFIG_HPET_TIMER_IRQ);
/* enable the IRQ in the interrupt controller */ /* enable the IRQ in the interrupt controller */

2
drivers/timer/loapic_timer.c
View file

@ -575,7 +575,7 @@ int _sys_clock_driver_init(struct device *device)
* Although the stub has already been "connected", the vector number * Although the stub has already been "connected", the vector number
* still has to be programmed into the interrupt controller. * still has to be programmed into the interrupt controller.
*/ */
IRQ_CONFIG(loapic, CONFIG_LOAPIC_TIMER_IRQ, 0); IRQ_CONFIG(loapic, CONFIG_LOAPIC_TIMER_IRQ);
/* Everything has been configured. It is now safe to enable the /* Everything has been configured. It is now safe to enable the
* interrupt * interrupt

2
drivers/watchdog/wdt_dw.c
View file

@ -73,7 +73,7 @@ static int wdt_dw_set_config(struct wdt_config *config)
sys_set_bit(WDT_BASE_ADDR + WDT_CR, 1); sys_set_bit(WDT_BASE_ADDR + WDT_CR, 1);
IRQ_CONFIG(wdt_dw, INT_WDT_IRQ, 0); IRQ_CONFIG(wdt_dw, INT_WDT_IRQ);
irq_enable(INT_WDT_IRQ); irq_enable(INT_WDT_IRQ);
/* unmask WDT interrupts to lmt */ /* unmask WDT interrupts to lmt */

3
include/arch/arc/arch.h
View file

@ -94,12 +94,11 @@ extern void _irq_priority_set(unsigned int irq, unsigned int prio);
* at the priority requested. * at the priority requested.
* @param device - Device name * @param device - Device name
* @param i IRQ number * @param i IRQ number
* @param p Priority for the interruption
* *
* @return N/A * @return N/A
* *
*/ */
#define IRQ_CONFIG(device, i, p) \ #define IRQ_CONFIG(device, i) \
_irq_priority_set(i, _##device##_int_priority) _irq_priority_set(i, _##device##_int_priority)
#endif #endif

3
include/arch/arm/cortex_m/irq.h
View file

@ -81,11 +81,10 @@ extern void _irq_priority_set(unsigned int irq, unsigned int prio);
* *
* @param device Device to configure * @param device Device to configure
* @param irq IRQ number * @param irq IRQ number
* @param priority IRQ priority (unused on this architecture)
* @return N/A * @return N/A
* *
*/ */
#define IRQ_CONFIG(device, irq, priority) \ #define IRQ_CONFIG(device, irq) \
_irq_priority_set(irq, _##device##_int_priority) _irq_priority_set(irq, _##device##_int_priority)
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */

3
include/arch/x86/arch.h
View file

@ -192,12 +192,11 @@ extern unsigned char _irq_to_interrupt_vector[];
* For x86 platform configure APIC and mark interrupt vector allocated * For x86 platform configure APIC and mark interrupt vector allocated
* @param device Device - not used by macro * @param device Device - not used by macro
* @param irq IRQ * @param irq IRQ
* @param priority IRQ priority, unused on this platform
* *
* @return N/A * @return N/A
* *
*/ */
#define IRQ_CONFIG(device, irq, priority) \ #define IRQ_CONFIG(device, irq) \
do { \ do { \
_SysIntVecProgram(_IRQ_TO_INTERRUPT_VECTOR((irq)), (irq), \ _SysIntVecProgram(_IRQ_TO_INTERRUPT_VECTOR((irq)), (irq), \
_##device##_irq_flags); \ _##device##_irq_flags); \