[coreboot-gerrit] Change in coreboot[master]: ioapic: extend definition name to avoid collision

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/25540 )

Change subject: ioapic: extend definition name to avoid collision
......................................................................

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 at scarletltd.com>
Reviewed-on: https://review.coreboot.org/25540
Reviewed-by: Martin Roth <martinroth at google.com>
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
---
M src/arch/x86/include/arch/ioapic.h
M src/arch/x86/ioapic.c
M src/drivers/generic/ioapic/ioapic.c
3 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved



diff --git a/src/arch/x86/include/arch/ioapic.h b/src/arch/x86/include/arch/ioapic.h
index ad96ba3..bc229d9 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 dba49c0..7bd52f5 100644
--- a/src/arch/x86/ioapic.c
+++ b/src/arch/x86/ioapic.c
@@ -53,7 +53,7 @@
 
 	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 @@
 	}
 
 	/* 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 @@
 
 	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 44f1b02..271e98c 100644
--- a/src/drivers/generic/ioapic/ioapic.c
+++ b/src/drivers/generic/ioapic/ioapic.c
@@ -61,7 +61,7 @@
 
 	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 @@
 		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++) {

-- 
To view, visit https://review.coreboot.org/25540
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I85b1c544d0f31340a09e18f4b36c1942ea0fa6ef
Gerrit-Change-Number: 25540
Gerrit-PatchSet: 3
Gerrit-Owner: Marc Jones <marc at marcjonesconsulting.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180409/5a4a0157/attachment.html>