From 43a49335f42e4ddbbca7d912317e65bdf83a8fbc Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 21 Jun 2019 12:54:15 -0400 Subject: [PATCH] include: move interrupt controller headers to interrupt_controller/ Move internal and architecture specific headers from include/drivers to subfolder for interrupt_controller: include/drivers/interrupt_controller/ Signed-off-by: Anas Nashif --- drivers/counter/counter_qmsi_aonpt.c | 2 +- drivers/counter/counter_rtc_qmsi.c | 2 +- drivers/gpio/gpio_dw.c | 2 +- drivers/gpio/gpio_qmsi.c | 2 +- drivers/i2c/i2c_dw.c | 2 +- drivers/i2c/i2c_qmsi.c | 2 +- drivers/interrupt_controller/ioapic_intr.c | 4 ++-- drivers/interrupt_controller/loapic_intr.c | 4 ++-- drivers/interrupt_controller/shared_irq.c | 2 +- drivers/interrupt_controller/system_apic.c | 6 +++--- drivers/serial/uart_qmsi.c | 2 +- drivers/spi/spi_dw.c | 2 +- drivers/spi/spi_intel.c | 2 +- drivers/watchdog/wdt_qmsi.c | 2 +- include/arch/x86/irq_controller.h | 2 +- include/drivers/{ => interrupt_controller}/ioapic.h | 0 include/drivers/{ => interrupt_controller}/loapic.h | 0 include/drivers/{ => interrupt_controller}/sysapic.h | 2 +- soc/x86/intel_quark/quark_se/soc.h | 2 +- soc/x86/intel_quark/quark_x1000/soc.c | 2 +- soc/x86/intel_quark/quark_x1000/soc.h | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) rename include/drivers/{ => interrupt_controller}/ioapic.h (100%) rename include/drivers/{ => interrupt_controller}/loapic.h (100%) rename include/drivers/{ => interrupt_controller}/sysapic.h (96%) diff --git a/drivers/counter/counter_qmsi_aonpt.c b/drivers/counter/counter_qmsi_aonpt.c index bc766be10e6..3afc6ed084c 100644 --- a/drivers/counter/counter_qmsi_aonpt.c +++ b/drivers/counter/counter_qmsi_aonpt.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/counter/counter_rtc_qmsi.c b/drivers/counter/counter_rtc_qmsi.c index 40d4514ff5a..8553d50fead 100644 --- a/drivers/counter/counter_rtc_qmsi.c +++ b/drivers/counter/counter_rtc_qmsi.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index 57eff9a1a10..8d62e1fb52f 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -23,7 +23,7 @@ #endif #ifdef CONFIG_IOAPIC -#include +#include #endif #ifdef CONFIG_DEVICE_POWER_MANAGEMENT diff --git a/drivers/gpio/gpio_qmsi.c b/drivers/gpio/gpio_qmsi.c index 243963706ea..2a1c9941496 100644 --- a/drivers/gpio/gpio_qmsi.c +++ b/drivers/gpio/gpio_qmsi.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c index 86180080588..7ab56acd9b9 100644 --- a/drivers/i2c/i2c_dw.c +++ b/drivers/i2c/i2c_dw.c @@ -23,7 +23,7 @@ #include #ifdef CONFIG_IOAPIC -#include +#include #endif #include "i2c_dw.h" diff --git a/drivers/i2c/i2c_qmsi.c b/drivers/i2c/i2c_qmsi.c index 5c71e74f943..daa18bb4365 100644 --- a/drivers/i2c/i2c_qmsi.c +++ b/drivers/i2c/i2c_qmsi.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include "qm_i2c.h" diff --git a/drivers/interrupt_controller/ioapic_intr.c b/drivers/interrupt_controller/ioapic_intr.c index 86b86ffcddb..c5aa0dc3303 100644 --- a/drivers/interrupt_controller/ioapic_intr.c +++ b/drivers/interrupt_controller/ioapic_intr.c @@ -58,8 +58,8 @@ #include #include -#include /* public API declarations */ -#include /* public API declarations and registers */ +#include /* public API declarations */ +#include /* public API declarations and registers */ #include "ioapic_priv.h" #define BITS_PER_IRQ 3 diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/loapic_intr.c index 4334e70b794..f56113f0320 100644 --- a/drivers/interrupt_controller/loapic_intr.c +++ b/drivers/interrupt_controller/loapic_intr.c @@ -17,9 +17,9 @@ #include #include -#include /* public API declarations */ +#include /* public API declarations */ #include -#include +#include /* Local APIC Version Register Bits */ diff --git a/drivers/interrupt_controller/shared_irq.c b/drivers/interrupt_controller/shared_irq.c index 7af6a334849..32d959269aa 100644 --- a/drivers/interrupt_controller/shared_irq.c +++ b/drivers/interrupt_controller/shared_irq.c @@ -13,7 +13,7 @@ #include #ifdef CONFIG_IOAPIC -#include +#include #endif /** diff --git a/drivers/interrupt_controller/system_apic.c b/drivers/interrupt_controller/system_apic.c index 0e7ae7f4ab7..1bf65847a6e 100644 --- a/drivers/interrupt_controller/system_apic.c +++ b/drivers/interrupt_controller/system_apic.c @@ -13,9 +13,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #define IS_IOAPIC_IRQ(irq) (irq < LOAPIC_IRQ_BASE) diff --git a/drivers/serial/uart_qmsi.c b/drivers/serial/uart_qmsi.c index 47bf2e06a3e..7539cfb8c36 100644 --- a/drivers/serial/uart_qmsi.c +++ b/drivers/serial/uart_qmsi.c @@ -7,7 +7,7 @@ #include #if defined(CONFIG_IOAPIC) -#include +#include #endif #include #include diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c index 5cb72472410..a5290973c91 100644 --- a/drivers/spi/spi_dw.c +++ b/drivers/spi/spi_dw.c @@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(spi_dw); #include #ifdef CONFIG_IOAPIC -#include +#include #endif #include diff --git a/drivers/spi/spi_intel.c b/drivers/spi/spi_intel.c index 035fcedd9ed..8f236568e33 100644 --- a/drivers/spi/spi_intel.c +++ b/drivers/spi/spi_intel.c @@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(spi_intel); #include "spi_intel.h" #ifdef CONFIG_IOAPIC -#include +#include #endif static void completed(struct device *dev, u32_t error) diff --git a/drivers/watchdog/wdt_qmsi.c b/drivers/watchdog/wdt_qmsi.c index dc7669ceca9..995fb461203 100644 --- a/drivers/watchdog/wdt_qmsi.c +++ b/drivers/watchdog/wdt_qmsi.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/arch/x86/irq_controller.h b/include/arch/x86/irq_controller.h index 96816307c47..a10baad45ba 100644 --- a/include/arch/x86/irq_controller.h +++ b/include/arch/x86/irq_controller.h @@ -12,7 +12,7 @@ #ifndef ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_ #define ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_ -#include +#include /* Triggering flags abstraction layer. * If a particular set of triggers is not supported, leave undefined diff --git a/include/drivers/ioapic.h b/include/drivers/interrupt_controller/ioapic.h similarity index 100% rename from include/drivers/ioapic.h rename to include/drivers/interrupt_controller/ioapic.h diff --git a/include/drivers/loapic.h b/include/drivers/interrupt_controller/loapic.h similarity index 100% rename from include/drivers/loapic.h rename to include/drivers/interrupt_controller/loapic.h diff --git a/include/drivers/sysapic.h b/include/drivers/interrupt_controller/sysapic.h similarity index 96% rename from include/drivers/sysapic.h rename to include/drivers/interrupt_controller/sysapic.h index d37cf38856a..2bdbe85bcca 100644 --- a/include/drivers/sysapic.h +++ b/include/drivers/interrupt_controller/sysapic.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_ #define ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_ -#include +#include #define _IRQ_TRIGGER_EDGE IOAPIC_EDGE #define _IRQ_TRIGGER_LEVEL IOAPIC_LEVEL diff --git a/soc/x86/intel_quark/quark_se/soc.h b/soc/x86/intel_quark/quark_se/soc.h index 71500762fc3..c5fae98272e 100644 --- a/soc/x86/intel_quark/quark_se/soc.h +++ b/soc/x86/intel_quark/quark_se/soc.h @@ -18,7 +18,7 @@ #include #ifdef CONFIG_IOAPIC -#include +#include #endif #define INT_VEC_IRQ0 0x20 /* Vector number for IRQ0 */ diff --git a/soc/x86/intel_quark/quark_x1000/soc.c b/soc/x86/intel_quark/quark_x1000/soc.c index 9f5a3d2c9ee..f7826d00db1 100644 --- a/soc/x86/intel_quark/quark_x1000/soc.c +++ b/soc/x86/intel_quark/quark_x1000/soc.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #ifdef CONFIG_PCI_LEGACY_BRIDGE diff --git a/soc/x86/intel_quark/quark_x1000/soc.h b/soc/x86/intel_quark/quark_x1000/soc.h index 1f947e1f0c5..86d52209333 100644 --- a/soc/x86/intel_quark/quark_x1000/soc.h +++ b/soc/x86/intel_quark/quark_x1000/soc.h @@ -23,7 +23,7 @@ #endif #ifdef CONFIG_IOAPIC -#include +#include #endif /*