diff options
| author | Marc Jones <marc.jones@scarletltd.com> | 2018-03-31 22:45:35 -0600 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-04-09 09:29:51 +0000 |
| commit | f7dc972fde66d93143c3f6927087c13ae74a4828 (patch) | |
| tree | 31f81790434b4d17fbc5d15f5a8e1edd6cf9fd29 | |
| parent | 4764be33e04aacc6f22645249046ed0524aaa529 (diff) | |
ioapic: extend definition name to avoid collision
Change EN/DISABLED to INT_EN/DISABLED to avoid collision with other
EN/DISABLE definition.
Change-Id: I85b1c544d0f31340a09e18f4b36c1942ea0fa6ef
Signed-off-by: Marc Jones <marc.jones@scarletltd.com>
Reviewed-on: https://review.coreboot.org/25540
Reviewed-by: Martin Roth <martinroth@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/arch/x86/include/arch/ioapic.h | 4 | ||||
| -rw-r--r-- | src/arch/x86/ioapic.c | 6 | ||||
| -rw-r--r-- | src/drivers/generic/ioapic/ioapic.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/arch/x86/include/arch/ioapic.h b/src/arch/x86/include/arch/ioapic.h index ad96ba3a5f..bc229d9952 100644 --- a/src/arch/x86/include/arch/ioapic.h +++ b/src/arch/x86/include/arch/ioapic.h @@ -26,8 +26,8 @@ #define ALL (0xff << 24) #define NONE (0) -#define DISABLED (1 << 16) -#define ENABLED (0 << 16) +#define INT_DISABLED (1 << 16) +#define INT_ENABLED (0 << 16) #define TRIGGER_EDGE (0 << 15) #define TRIGGER_LEVEL (1 << 15) #define POLARITY_HIGH (0 << 13) diff --git a/src/arch/x86/ioapic.c b/src/arch/x86/ioapic.c index dba49c06b8..7bd52f566e 100644 --- a/src/arch/x86/ioapic.c +++ b/src/arch/x86/ioapic.c @@ -53,7 +53,7 @@ void clear_ioapic(void *ioapic_base) ioapic_interrupts = ioapic_interrupt_count(ioapic_base); - low = DISABLED; + low = INT_DISABLED; high = NONE; for (i = 0; i < ioapic_interrupts; i++) { @@ -118,7 +118,7 @@ static void load_vectors(void *ioapic_base) } /* Enable Virtual Wire Mode. */ - low = ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT; + low = INT_ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT; high = bsp_lapicid << (56 - 32); io_apic_write(ioapic_base, 0x10, low); @@ -131,7 +131,7 @@ static void load_vectors(void *ioapic_base) printk(BIOS_SPEW, "IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", 0, high, low); - low = DISABLED; + low = INT_DISABLED; high = NONE; for (i = 1; i < ioapic_interrupts; i++) { io_apic_write(ioapic_base, i * 2 + 0x10, low); diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c index 44f1b02424..271e98c2e3 100644 --- a/src/drivers/generic/ioapic/ioapic.c +++ b/src/drivers/generic/ioapic/ioapic.c @@ -61,7 +61,7 @@ static void ioapic_init(struct device *dev) if (config->enable_virtual_wire) { /* Enable Virtual Wire Mode. */ - low = ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT; + low = INT_ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT; high = bsp_lapicid << (56 - 32); io_apic_write(ioapic_base, 0x10, low); @@ -75,7 +75,7 @@ static void ioapic_init(struct device *dev) printk(BIOS_SPEW, "IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", 0, high, low); } - low = DISABLED; + low = INT_DISABLED; high = NONE; for (i = 1; i < ioapic_interrupts; i++) { |