From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Thu, 12 Jan 2012 10:48:29 +0000 (+0800)
Subject: ioapic_abi: More consistent function name w/ legacy interrupt
X-Git-Url: https://gitweb.dragonflybsd.org/~mneumann/dragonfly.git/commitdiff_plain/027bbbfe9dce35d65da5926193e7d1ce1624544a

ioapic_abi: More consistent function name w/ legacy interrupt

No functional changes
---

diff --git a/sys/platform/pc32/apic/ioapic.c b/sys/platform/pc32/apic/ioapic.c
index 45f6f011f6..55db0e19e6 100644
--- a/sys/platform/pc32/apic/ioapic.c
+++ b/sys/platform/pc32/apic/ioapic.c
@@ -199,7 +199,7 @@ ioapic_config(void)
 	 */
 	TAILQ_FOREACH(info, &ioapic_conf.ioc_list, io_link)
 		ioapic_setup(info);
-	ioapic_abi_fixup_irqmap();
+	ioapic_fixup_legacy_irqmaps();
 
 	write_eflags(ef);
 
@@ -392,7 +392,7 @@ ioapic_gsi_setup(int gsi)
 		}
 	}
 
-	ioapic_abi_set_irqmap(irq, gsi, trig, pola);
+	ioapic_set_legacy_irqmap(irq, gsi, trig, pola);
 }
 
 void *
diff --git a/sys/platform/pc32/apic/ioapic_abi.c b/sys/platform/pc32/apic/ioapic_abi.c
index 344ed7ac2c..cb3166b417 100644
--- a/sys/platform/pc32/apic/ioapic_abi.c
+++ b/sys/platform/pc32/apic/ioapic_abi.c
@@ -752,7 +752,7 @@ ioapic_abi_initmap(void)
 }
 
 void
-ioapic_abi_set_irqmap(int irq, int gsi, enum intr_trigger trig,
+ioapic_set_legacy_irqmap(int irq, int gsi, enum intr_trigger trig,
     enum intr_polarity pola)
 {
 	struct ioapic_irqinfo *info;
@@ -805,7 +805,7 @@ ioapic_abi_set_irqmap(int irq, int gsi, enum intr_trigger trig,
 }
 
 void
-ioapic_abi_fixup_irqmap(void)
+ioapic_fixup_legacy_irqmaps(void)
 {
 	int cpu;
 
@@ -833,7 +833,8 @@ ioapic_abi_fixup_irqmap(void)
 }
 
 int
-ioapic_abi_find_gsi(int gsi, enum intr_trigger trig, enum intr_polarity pola)
+ioapic_find_legacy_by_gsi(int gsi, enum intr_trigger trig,
+    enum intr_polarity pola)
 {
 	int cpu;
 
@@ -863,7 +864,8 @@ ioapic_abi_find_gsi(int gsi, enum intr_trigger trig, enum intr_polarity pola)
 }
 
 int
-ioapic_abi_find_irq(int irq, enum intr_trigger trig, enum intr_polarity pola)
+ioapic_find_legacy_by_irq(int irq, enum intr_trigger trig,
+    enum intr_polarity pola)
 {
 	int cpu;
 
@@ -956,7 +958,7 @@ ioapic_abi_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola)
 }
 
 int
-ioapic_abi_extint_irqmap(int irq)
+ioapic_conf_legacy_extint(int irq)
 {
 	struct ioapic_irqinfo *info;
 	struct ioapic_irqmap *map;
diff --git a/sys/platform/pc32/apic/ioapic_abi.h b/sys/platform/pc32/apic/ioapic_abi.h
index d77c611195..3fd3d4eac2 100644
--- a/sys/platform/pc32/apic/ioapic_abi.h
+++ b/sys/platform/pc32/apic/ioapic_abi.h
@@ -65,11 +65,12 @@ extern struct ioapic_irqinfo	ioapic_irqs[];
 
 extern struct machintr_abi MachIntrABI_IOAPIC;
 
-int	ioapic_abi_extint_irqmap(int);
-void	ioapic_abi_set_irqmap(int, int, enum intr_trigger, enum intr_polarity);
-void	ioapic_abi_fixup_irqmap(void);
+int	ioapic_conf_legacy_extint(int);
+void	ioapic_set_legacy_irqmap(int, int, enum intr_trigger,
+	    enum intr_polarity);
+void	ioapic_fixup_legacy_irqmaps(void);
 
-int	ioapic_abi_find_gsi(int, enum intr_trigger, enum intr_polarity);
-int	ioapic_abi_find_irq(int, enum intr_trigger, enum intr_polarity);
+int	ioapic_find_legacy_by_gsi(int, enum intr_trigger, enum intr_polarity);
+int	ioapic_find_legacy_by_irq(int, enum intr_trigger, enum intr_polarity);
 
 #endif	/* !_ARCH_APIC_IOAPIC_ABI_H_ */
diff --git a/sys/platform/pc32/i386/mptable.c b/sys/platform/pc32/i386/mptable.c
index 63f99356b5..36c15ac7da 100644
--- a/sys/platform/pc32/i386/mptable.c
+++ b/sys/platform/pc32/i386/mptable.c
@@ -1424,7 +1424,7 @@ mptable_pci_int_route(int bus, int dev, int pin, int intline)
 		gsi = ioapic_gsi(pci_int->mpci_ioapic_idx,
 			pci_int->mpci_ioapic_pin);
 		if (gsi >= 0) {
-			irq = ioapic_abi_find_gsi(gsi,
+			irq = ioapic_find_legacy_by_gsi(gsi,
 				INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
 		}
 	}
@@ -1435,7 +1435,7 @@ mptable_pci_int_route(int bus, int dev, int pin, int intline)
 				"for %d:%d INT%c\n", bus, dev, pin + 'A');
 		}
 
-		irq = ioapic_abi_find_irq(intline,
+		irq = ioapic_find_legacy_by_irq(intline,
 			INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
 	}
 
diff --git a/sys/platform/pc32/isa/clock.c b/sys/platform/pc32/isa/clock.c
index 6cfed1152f..4af55a2188 100644
--- a/sys/platform/pc32/isa/clock.c
+++ b/sys/platform/pc32/isa/clock.c
@@ -1057,14 +1057,14 @@ i8254_intr_initclock(struct cputimer_intr *cti, boolean_t selected)
 
 	/* Finish initializing 8253 timer 0. */
 	if (ioapic_enable) {
-		irq = ioapic_abi_find_irq(0, INTR_TRIGGER_EDGE,
+		irq = ioapic_find_legacy_by_irq(0, INTR_TRIGGER_EDGE,
 			INTR_POLARITY_HIGH);
 		if (irq < 0) {
 mixed_mode_setup:
-			error = ioapic_abi_extint_irqmap(0);
+			error = ioapic_conf_legacy_extint(0);
 			if (!error) {
-				irq = ioapic_abi_find_irq(0, INTR_TRIGGER_EDGE,
-					INTR_POLARITY_HIGH);
+				irq = ioapic_find_legacy_by_irq(0,
+				    INTR_TRIGGER_EDGE, INTR_POLARITY_HIGH);
 				if (irq < 0)
 					error = ENOENT;
 			}
diff --git a/sys/platform/pc64/apic/ioapic.c b/sys/platform/pc64/apic/ioapic.c
index 5e03788447..a1e6709d6f 100644
--- a/sys/platform/pc64/apic/ioapic.c
+++ b/sys/platform/pc64/apic/ioapic.c
@@ -199,7 +199,7 @@ ioapic_config(void)
 	 */
 	TAILQ_FOREACH(info, &ioapic_conf.ioc_list, io_link)
 		ioapic_setup(info);
-	ioapic_abi_fixup_irqmap();
+	ioapic_fixup_legacy_irqmaps();
 
 	write_rflags(ef);
 
@@ -392,7 +392,7 @@ ioapic_gsi_setup(int gsi)
 		}
 	}
 
-	ioapic_abi_set_irqmap(irq, gsi, trig, pola);
+	ioapic_set_legacy_irqmap(irq, gsi, trig, pola);
 }
 
 void *
diff --git a/sys/platform/pc64/apic/ioapic_abi.c b/sys/platform/pc64/apic/ioapic_abi.c
index b91b89f57b..681b3ade7a 100644
--- a/sys/platform/pc64/apic/ioapic_abi.c
+++ b/sys/platform/pc64/apic/ioapic_abi.c
@@ -749,7 +749,7 @@ ioapic_abi_initmap(void)
 }
 
 void
-ioapic_abi_set_irqmap(int irq, int gsi, enum intr_trigger trig,
+ioapic_set_legacy_irqmap(int irq, int gsi, enum intr_trigger trig,
     enum intr_polarity pola)
 {
 	struct ioapic_irqinfo *info;
@@ -802,7 +802,7 @@ ioapic_abi_set_irqmap(int irq, int gsi, enum intr_trigger trig,
 }
 
 void
-ioapic_abi_fixup_irqmap(void)
+ioapic_fixup_legacy_irqmaps(void)
 {
 	int cpu;
 
@@ -830,7 +830,8 @@ ioapic_abi_fixup_irqmap(void)
 }
 
 int
-ioapic_abi_find_gsi(int gsi, enum intr_trigger trig, enum intr_polarity pola)
+ioapic_find_legacy_by_gsi(int gsi, enum intr_trigger trig,
+    enum intr_polarity pola)
 {
 	int cpu;
 
@@ -860,7 +861,8 @@ ioapic_abi_find_gsi(int gsi, enum intr_trigger trig, enum intr_polarity pola)
 }
 
 int
-ioapic_abi_find_irq(int irq, enum intr_trigger trig, enum intr_polarity pola)
+ioapic_find_legacy_by_irq(int irq, enum intr_trigger trig,
+    enum intr_polarity pola)
 {
 	int cpu;
 
@@ -953,7 +955,7 @@ ioapic_abi_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola)
 }
 
 int
-ioapic_abi_extint_irqmap(int irq)
+ioapic_conf_legacy_extint(int irq)
 {
 	struct ioapic_irqinfo *info;
 	struct ioapic_irqmap *map;
diff --git a/sys/platform/pc64/apic/ioapic_abi.h b/sys/platform/pc64/apic/ioapic_abi.h
index 343d66b780..ff0be4df96 100644
--- a/sys/platform/pc64/apic/ioapic_abi.h
+++ b/sys/platform/pc64/apic/ioapic_abi.h
@@ -64,11 +64,12 @@ extern struct ioapic_irqinfo	ioapic_irqs[];
 
 extern struct machintr_abi MachIntrABI_IOAPIC;
 
-int	ioapic_abi_extint_irqmap(int);
-void	ioapic_abi_set_irqmap(int, int, enum intr_trigger, enum intr_polarity);
-void	ioapic_abi_fixup_irqmap(void);
+int	ioapic_conf_legacy_extint(int);
+void	ioapic_set_legacy_irqmap(int, int, enum intr_trigger,
+	    enum intr_polarity);
+void	ioapic_fixup_legacy_irqmaps(void);
 
-int	ioapic_abi_find_gsi(int, enum intr_trigger, enum intr_polarity);
-int	ioapic_abi_find_irq(int, enum intr_trigger, enum intr_polarity);
+int	ioapic_find_legacy_by_gsi(int, enum intr_trigger, enum intr_polarity);
+int	ioapic_find_legacy_by_irq(int, enum intr_trigger, enum intr_polarity);
 
 #endif	/* !_ARCH_APIC_IOAPIC_ABI_H_ */
diff --git a/sys/platform/pc64/isa/clock.c b/sys/platform/pc64/isa/clock.c
index d408b1616e..13c5589780 100644
--- a/sys/platform/pc64/isa/clock.c
+++ b/sys/platform/pc64/isa/clock.c
@@ -1064,14 +1064,14 @@ i8254_intr_initclock(struct cputimer_intr *cti, boolean_t selected)
 
 	/* Finish initializing 8254 timer 0. */
 	if (ioapic_enable) {
-		irq = ioapic_abi_find_irq(0, INTR_TRIGGER_EDGE,
+		irq = ioapic_find_legacy_by_irq(0, INTR_TRIGGER_EDGE,
 			INTR_POLARITY_HIGH);
 		if (irq < 0) {
 mixed_mode_setup:
-			error = ioapic_abi_extint_irqmap(0);
+			error = ioapic_conf_legacy_extint(0);
 			if (!error) {
-				irq = ioapic_abi_find_irq(0, INTR_TRIGGER_EDGE,
-					INTR_POLARITY_HIGH);
+				irq = ioapic_find_legacy_by_irq(0,
+				    INTR_TRIGGER_EDGE, INTR_POLARITY_HIGH);
 				if (irq < 0)
 					error = ENOENT;
 			}
diff --git a/sys/platform/pc64/x86_64/mptable.c b/sys/platform/pc64/x86_64/mptable.c
index b81e51b540..3b92d745f1 100644
--- a/sys/platform/pc64/x86_64/mptable.c
+++ b/sys/platform/pc64/x86_64/mptable.c
@@ -1424,7 +1424,7 @@ mptable_pci_int_route(int bus, int dev, int pin, int intline)
 		gsi = ioapic_gsi(pci_int->mpci_ioapic_idx,
 			pci_int->mpci_ioapic_pin);
 		if (gsi >= 0) {
-			irq = ioapic_abi_find_gsi(gsi,
+			irq = ioapic_find_legacy_by_gsi(gsi,
 				INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
 		}
 	}
@@ -1435,7 +1435,7 @@ mptable_pci_int_route(int bus, int dev, int pin, int intline)
 				"for %d:%d INT%c\n", bus, dev, pin + 'A');
 		}
 
-		irq = ioapic_abi_find_irq(intline,
+		irq = ioapic_find_legacy_by_irq(intline,
 			INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
 	}