Skip to content
Permalink
Browse files

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 <anas.nashif@intel.com>
  • Loading branch information...
nashif committed Jun 21, 2019
1 parent 1c6c657 commit 43a49335f42e4ddbbca7d912317e65bdf83a8fbc
@@ -8,7 +8,7 @@

#include <device.h>
#include <init.h>
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#include <counter.h>
#include <power.h>
#include <soc.h>
@@ -7,7 +7,7 @@
#include <errno.h>

#include <device.h>
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#include <counter.h>
#include <init.h>
#include <kernel.h>
@@ -23,7 +23,7 @@
#endif

#ifdef CONFIG_IOAPIC
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#endif

#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
@@ -7,7 +7,7 @@
#include <errno.h>

#include <device.h>
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#include <gpio.h>
#include <init.h>
#include <sys_io.h>
@@ -23,7 +23,7 @@
#include <misc/util.h>

#ifdef CONFIG_IOAPIC
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#endif

#include "i2c_dw.h"
@@ -8,7 +8,7 @@

#include <device.h>
#include <i2c.h>
#include <ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#include <power.h>

#include "qm_i2c.h"
@@ -58,8 +58,8 @@
#include <init.h>
#include <string.h>

#include <drivers/ioapic.h> /* public API declarations */
#include <drivers/loapic.h> /* public API declarations and registers */
#include <drivers/interrupt_controller/ioapic.h> /* public API declarations */
#include <drivers/interrupt_controller/loapic.h> /* public API declarations and registers */
#include "ioapic_priv.h"

#define BITS_PER_IRQ 3
@@ -17,9 +17,9 @@

#include <toolchain.h>
#include <linker/sections.h>
#include <drivers/loapic.h> /* public API declarations */
#include <drivers/interrupt_controller/loapic.h> /* public API declarations */
#include <init.h>
#include <drivers/sysapic.h>
#include <drivers/interrupt_controller/sysapic.h>

/* Local APIC Version Register Bits */

@@ -13,7 +13,7 @@
#include <sys_io.h>

#ifdef CONFIG_IOAPIC
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#endif

/**
@@ -13,9 +13,9 @@
#include <misc/__assert.h>
#include <kernel.h>
#include <arch/cpu.h>
#include <drivers/ioapic.h>
#include <drivers/loapic.h>
#include <drivers/sysapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#include <drivers/interrupt_controller/loapic.h>
#include <drivers/interrupt_controller/sysapic.h>
#include <irq.h>

#define IS_IOAPIC_IRQ(irq) (irq < LOAPIC_IRQ_BASE)
@@ -7,7 +7,7 @@

#include <device.h>
#if defined(CONFIG_IOAPIC)
#include <ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#endif
#include <uart.h>
#include <power.h>
@@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(spi_dw);
#include <misc/util.h>

#ifdef CONFIG_IOAPIC
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#endif

#include <spi.h>
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(spi_intel);
#include "spi_intel.h"

#ifdef CONFIG_IOAPIC
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#endif

static void completed(struct device *dev, u32_t error)
@@ -8,7 +8,7 @@
#include <device.h>
#include <kernel.h>
#include <watchdog.h>
#include <ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#include <power.h>
#include <soc.h>

@@ -12,7 +12,7 @@
#ifndef ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_
#define ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_

#include <drivers/sysapic.h>
#include <drivers/interrupt_controller/sysapic.h>

/* Triggering flags abstraction layer.
* If a particular set of triggers is not supported, leave undefined
File renamed without changes.
File renamed without changes.
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_
#define ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_

#include <drivers/loapic.h>
#include <drivers/interrupt_controller/loapic.h>

#define _IRQ_TRIGGER_EDGE IOAPIC_EDGE
#define _IRQ_TRIGGER_LEVEL IOAPIC_LEVEL
@@ -18,7 +18,7 @@
#include <uart.h>

#ifdef CONFIG_IOAPIC
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#endif

#define INT_VEC_IRQ0 0x20 /* Vector number for IRQ0 */
@@ -24,7 +24,7 @@
#include <uart.h>
#include <drivers/pci/pci.h>
#include <drivers/pci/pci_mgr.h>
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>


#ifdef CONFIG_PCI_LEGACY_BRIDGE
@@ -23,7 +23,7 @@
#endif

#ifdef CONFIG_IOAPIC
#include <drivers/ioapic.h>
#include <drivers/interrupt_controller/ioapic.h>
#endif

/*

0 comments on commit 43a4933

Please sign in to comment.
You can’t perform that action at this time.