From 780a6eecca0242fcf149afeb850eb564fc2c4e56 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Sun, 18 Sep 2011 20:05:32 +0800 Subject: [PATCH] machintr/i386: Function renaming; no functional changes --- sys/platform/pc32/apic/ioapic_abi.c | 37 +++++++++++++++-------------- sys/platform/pc32/icu/icu_abi.c | 37 +++++++++++++++-------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/sys/platform/pc32/apic/ioapic_abi.c b/sys/platform/pc32/apic/ioapic_abi.c index a98341d2d8..dbe928c11d 100644 --- a/sys/platform/pc32/apic/ioapic_abi.c +++ b/sys/platform/pc32/apic/ioapic_abi.c @@ -480,13 +480,14 @@ static void ioapic_abi_intr_enable(int); static void ioapic_abi_intr_disable(int); static void ioapic_abi_intr_setup(int, int); static void ioapic_abi_intr_teardown(int); -static void ioapic_intr_config(int, enum intr_trigger, enum intr_polarity); +static void ioapic_abi_intr_config(int, + enum intr_trigger, enum intr_polarity); -static void ioapic_finalize(void); -static void ioapic_cleanup(void); -static void ioapic_setdefault(void); -static void ioapic_stabilize(void); -static void ioapic_initmap(void); +static void ioapic_abi_finalize(void); +static void ioapic_abi_cleanup(void); +static void ioapic_abi_setdefault(void); +static void ioapic_abi_stabilize(void); +static void ioapic_abi_initmap(void); struct machintr_abi MachIntrABI_IOAPIC = { MACHINTR_IOAPIC, @@ -495,13 +496,13 @@ struct machintr_abi MachIntrABI_IOAPIC = { .intr_enable = ioapic_abi_intr_enable, .intr_setup = ioapic_abi_intr_setup, .intr_teardown = ioapic_abi_intr_teardown, - .intr_config = ioapic_intr_config, + .intr_config = ioapic_abi_intr_config, - .finalize = ioapic_finalize, - .cleanup = ioapic_cleanup, - .setdefault = ioapic_setdefault, - .stabilize = ioapic_stabilize, - .initmap = ioapic_initmap + .finalize = ioapic_abi_finalize, + .cleanup = ioapic_abi_cleanup, + .setdefault = ioapic_abi_setdefault, + .stabilize = ioapic_abi_stabilize, + .initmap = ioapic_abi_initmap }; static int ioapic_abi_extint_irq = -1; @@ -529,7 +530,7 @@ ioapic_abi_intr_disable(int irq) } static void -ioapic_finalize(void) +ioapic_abi_finalize(void) { KKASSERT(MachIntrABI.type == MACHINTR_IOAPIC); KKASSERT(ioapic_enable); @@ -550,14 +551,14 @@ ioapic_finalize(void) * that had already been posted to the cpu. */ static void -ioapic_cleanup(void) +ioapic_abi_cleanup(void) { bzero(mdcpu->gd_ipending, sizeof(mdcpu->gd_ipending)); } /* Must never be called */ static void -ioapic_stabilize(void) +ioapic_abi_stabilize(void) { panic("ioapic_stabilize() is called\n"); } @@ -651,7 +652,7 @@ ioapic_abi_intr_teardown(int intr) } static void -ioapic_setdefault(void) +ioapic_abi_setdefault(void) { int intr; @@ -664,7 +665,7 @@ ioapic_setdefault(void) } static void -ioapic_initmap(void) +ioapic_abi_initmap(void) { int i; @@ -785,7 +786,7 @@ ioapic_abi_find_irq(int irq, enum intr_trigger trig, enum intr_polarity pola) } static void -ioapic_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola) +ioapic_abi_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola) { struct ioapic_irqinfo *info; struct ioapic_irqmap *map; diff --git a/sys/platform/pc32/icu/icu_abi.c b/sys/platform/pc32/icu/icu_abi.c index c8e45ec87e..abdce01656 100644 --- a/sys/platform/pc32/icu/icu_abi.c +++ b/sys/platform/pc32/icu/icu_abi.c @@ -98,12 +98,13 @@ extern int imcr_present; static void icu_abi_intr_setup(int, int); static void icu_abi_intr_teardown(int); -static void icu_finalize(void); -static void icu_cleanup(void); -static void icu_setdefault(void); -static void icu_stabilize(void); -static void icu_initmap(void); -static void icu_intr_config(int, enum intr_trigger, enum intr_polarity); +static void icu_abi_intr_config(int, enum intr_trigger, enum intr_polarity); + +static void icu_abi_finalize(void); +static void icu_abi_cleanup(void); +static void icu_abi_setdefault(void); +static void icu_abi_stabilize(void); +static void icu_abi_initmap(void); struct machintr_abi MachIntrABI_ICU = { MACHINTR_ICU, @@ -112,13 +113,13 @@ struct machintr_abi MachIntrABI_ICU = { .intr_enable = ICU_INTREN, .intr_setup = icu_abi_intr_setup, .intr_teardown = icu_abi_intr_teardown, - .intr_config = icu_intr_config, + .intr_config = icu_abi_intr_config, - .finalize = icu_finalize, - .cleanup = icu_cleanup, - .setdefault = icu_setdefault, - .stabilize = icu_stabilize, - .initmap = icu_initmap + .finalize = icu_abi_finalize, + .cleanup = icu_abi_cleanup, + .setdefault = icu_abi_setdefault, + .stabilize = icu_abi_stabilize, + .initmap = icu_abi_initmap }; /* @@ -129,7 +130,7 @@ struct machintr_abi MachIntrABI_ICU = { * Called before interrupts are physically enabled */ static void -icu_stabilize(void) +icu_abi_stabilize(void) { int intr; @@ -143,7 +144,7 @@ icu_stabilize(void) * critical section is released. */ static void -icu_cleanup(void) +icu_abi_cleanup(void) { bzero(mdcpu->gd_ipending, sizeof(mdcpu->gd_ipending)); } @@ -153,7 +154,7 @@ icu_cleanup(void) * held and interrupts are not physically disabled. */ static void -icu_finalize(void) +icu_abi_finalize(void) { KKASSERT(MachIntrABI.type == MACHINTR_ICU); KKASSERT(!ioapic_enable); @@ -208,7 +209,7 @@ icu_abi_intr_teardown(int intr) } static void -icu_setdefault(void) +icu_abi_setdefault(void) { int intr; @@ -221,7 +222,7 @@ icu_setdefault(void) } static void -icu_initmap(void) +icu_abi_initmap(void) { int i; @@ -243,7 +244,7 @@ icu_initmap(void) } static void -icu_intr_config(int irq, enum intr_trigger trig, +icu_abi_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola __unused) { struct icu_irqmap *map; -- 2.41.0