From f5414fe4f9efb5ce560d70265661eabfc1da5341 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Mon, 5 Sep 2011 19:42:41 +0800 Subject: [PATCH] MachIntrABI: Remove unused setvar/getvar interfaces --- sys/conf/files | 1 - sys/kern/kern_machintr.c | 57 ---------------------- sys/platform/pc32/apic/ioapic_abi.c | 16 ------ sys/platform/pc32/icu/icu_abi.c | 15 ------ sys/platform/pc64/apic/ioapic_abi.c | 16 ------ sys/platform/pc64/icu/icu_abi.c | 15 ------ sys/platform/vkernel/platform/machintr.c | 16 ------ sys/platform/vkernel64/platform/machintr.c | 16 ------ sys/sys/machintr.h | 7 --- 9 files changed, 159 deletions(-) delete mode 100644 sys/kern/kern_machintr.c diff --git a/sys/conf/files b/sys/conf/files index affc74186d..3eea9ad5d8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -865,7 +865,6 @@ kern/kern_checkpoint.c standard kern/kern_sysref.c standard kern/kern_ccms.c standard kern/kern_intr.c standard -kern/kern_machintr.c standard kern/kern_varsym.c standard kern/kern_module.c standard kern/kern_linker.c standard diff --git a/sys/kern/kern_machintr.c b/sys/kern/kern_machintr.c deleted file mode 100644 index 510983b05f..0000000000 --- a/sys/kern/kern_machintr.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2005 The DragonFly Project. All rights reserved. - * - * This code is derived from software contributed to The DragonFly Project - * by Matthew Dillon - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of The DragonFly Project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific, prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $DragonFly: src/sys/kern/kern_machintr.c,v 1.1 2005/11/02 18:42:10 dillon Exp $ - */ -/* - * This code provides an ABI for managing machine-level interrupts. The - * machine independant code abstracts an interrupt source into an - * IRQ number. At the MI level the number of IRQs is typically limited - * to 256, but may be more severely limited by the installed machine-layer. - * - * machintr structures are manipulated by the BUS and other code and may - * contain additional opaque reference info. MI code is only allowed to - * access the irq field. - */ - -#include -#include -#include - -int -machintr_setvar_simple(int varid, int value) -{ - KKASSERT((varid & MACHINTR_VAR_SIZEMASK) == sizeof(int)); - return (MachIntrABI.setvar(varid, &value)); -} - diff --git a/sys/platform/pc32/apic/ioapic_abi.c b/sys/platform/pc32/apic/ioapic_abi.c index a8f5745441..edfdecdd7e 100644 --- a/sys/platform/pc32/apic/ioapic_abi.c +++ b/sys/platform/pc32/apic/ioapic_abi.c @@ -476,8 +476,6 @@ extern void IOAPIC_INTRDIS(int); extern int imcr_present; -static int ioapic_setvar(int, const void *); -static int ioapic_getvar(int, void *); static int ioapic_vectorctl(int, int, int); static void ioapic_finalize(void); static void ioapic_cleanup(void); @@ -493,8 +491,6 @@ struct machintr_abi MachIntrABI_IOAPIC = { .intrdis = ioapic_abi_intrdis, .intren = ioapic_abi_intren, .vectorctl = ioapic_vectorctl, - .setvar = ioapic_setvar, - .getvar = ioapic_getvar, .finalize = ioapic_finalize, .cleanup = ioapic_cleanup, .setdefault = ioapic_setdefault, @@ -527,18 +523,6 @@ ioapic_abi_intrdis(int irq) IOAPIC_INTRDIS(irq); } -static int -ioapic_setvar(int varid, const void *buf) -{ - return ENOENT; -} - -static int -ioapic_getvar(int varid, void *buf) -{ - return ENOENT; -} - static void ioapic_finalize(void) { diff --git a/sys/platform/pc32/icu/icu_abi.c b/sys/platform/pc32/icu/icu_abi.c index 84ae052723..eccdd6e70d 100644 --- a/sys/platform/pc32/icu/icu_abi.c +++ b/sys/platform/pc32/icu/icu_abi.c @@ -97,8 +97,6 @@ extern void ICU_INTRDIS(int); extern int imcr_present; static int icu_vectorctl(int, int, int); -static int icu_setvar(int, const void *); -static int icu_getvar(int, void *); static void icu_finalize(void); static void icu_cleanup(void); static void icu_setdefault(void); @@ -111,8 +109,6 @@ struct machintr_abi MachIntrABI_ICU = { .intrdis = ICU_INTRDIS, .intren = ICU_INTREN, .vectorctl = icu_vectorctl, - .setvar = icu_setvar, - .getvar = icu_getvar, .finalize = icu_finalize, .cleanup = icu_cleanup, .setdefault = icu_setdefault, @@ -124,17 +120,6 @@ struct machintr_abi MachIntrABI_ICU = { /* * WARNING! SMP builds can use the ICU now so this code must be MP safe. */ -static int -icu_setvar(int varid, const void *buf) -{ - return ENOENT; -} - -static int -icu_getvar(int varid, void *buf) -{ - return ENOENT; -} /* * Called before interrupts are physically enabled diff --git a/sys/platform/pc64/apic/ioapic_abi.c b/sys/platform/pc64/apic/ioapic_abi.c index b0d088235f..a4023647d3 100644 --- a/sys/platform/pc64/apic/ioapic_abi.c +++ b/sys/platform/pc64/apic/ioapic_abi.c @@ -476,8 +476,6 @@ extern void IOAPIC_INTRDIS(int); extern int imcr_present; -static int ioapic_setvar(int, const void *); -static int ioapic_getvar(int, void *); static int ioapic_vectorctl(int, int, int); static void ioapic_finalize(void); static void ioapic_cleanup(void); @@ -493,8 +491,6 @@ struct machintr_abi MachIntrABI_IOAPIC = { .intrdis = ioapic_abi_intrdis, .intren = ioapic_abi_intren, .vectorctl = ioapic_vectorctl, - .setvar = ioapic_setvar, - .getvar = ioapic_getvar, .finalize = ioapic_finalize, .cleanup = ioapic_cleanup, .setdefault = ioapic_setdefault, @@ -527,18 +523,6 @@ ioapic_abi_intrdis(int irq) IOAPIC_INTRDIS(irq); } -static int -ioapic_setvar(int varid, const void *buf) -{ - return ENOENT; -} - -static int -ioapic_getvar(int varid, void *buf) -{ - return ENOENT; -} - static void ioapic_finalize(void) { diff --git a/sys/platform/pc64/icu/icu_abi.c b/sys/platform/pc64/icu/icu_abi.c index ec007cf927..a32fd22f9b 100644 --- a/sys/platform/pc64/icu/icu_abi.c +++ b/sys/platform/pc64/icu/icu_abi.c @@ -97,8 +97,6 @@ extern void ICU_INTRDIS(int); extern int imcr_present; static int icu_vectorctl(int, int, int); -static int icu_setvar(int, const void *); -static int icu_getvar(int, void *); static void icu_finalize(void); static void icu_cleanup(void); static void icu_setdefault(void); @@ -111,8 +109,6 @@ struct machintr_abi MachIntrABI_ICU = { .intrdis = ICU_INTRDIS, .intren = ICU_INTREN, .vectorctl = icu_vectorctl, - .setvar = icu_setvar, - .getvar = icu_getvar, .finalize = icu_finalize, .cleanup = icu_cleanup, .setdefault = icu_setdefault, @@ -124,17 +120,6 @@ struct machintr_abi MachIntrABI_ICU = { /* * WARNING! SMP builds can use the ICU now so this code must be MP safe. */ -static int -icu_setvar(int varid, const void *buf) -{ - return ENOENT; -} - -static int -icu_getvar(int varid, void *buf) -{ - return ENOENT; -} /* * Called before interrupts are physically enabled diff --git a/sys/platform/vkernel/platform/machintr.c b/sys/platform/vkernel/platform/machintr.c index efe31175b8..6149eda837 100644 --- a/sys/platform/vkernel/platform/machintr.c +++ b/sys/platform/vkernel/platform/machintr.c @@ -55,8 +55,6 @@ static void dummy_intrdis(int); static void dummy_intren(int); static int dummy_vectorctl(int, int, int); -static int dummy_setvar(int, const void *); -static int dummy_getvar(int, void *); static void dummy_finalize(void); static void dummy_intrcleanup(void); static void dummy_stabilize(void); @@ -66,8 +64,6 @@ struct machintr_abi MachIntrABI = { .intrdis = dummy_intrdis, .intren = dummy_intren, .vectorctl = dummy_vectorctl, - .setvar = dummy_setvar, - .getvar = dummy_getvar, .finalize = dummy_finalize, .cleanup = dummy_intrcleanup, .stabilize = dummy_stabilize @@ -90,18 +86,6 @@ dummy_vectorctl(int op, int intr, int flags) /* return (EOPNOTSUPP); */ } -static int -dummy_setvar(int varid, const void *buf) -{ - return (ENOENT); -} - -static int -dummy_getvar(int varid, void *buf) -{ - return (ENOENT); -} - static void dummy_finalize(void) { diff --git a/sys/platform/vkernel64/platform/machintr.c b/sys/platform/vkernel64/platform/machintr.c index 6b90555305..4a15917f4c 100644 --- a/sys/platform/vkernel64/platform/machintr.c +++ b/sys/platform/vkernel64/platform/machintr.c @@ -55,8 +55,6 @@ static void dummy_intrdis(int); static void dummy_intren(int); static int dummy_vectorctl(int, int, int); -static int dummy_setvar(int, const void *); -static int dummy_getvar(int, void *); static void dummy_finalize(void); static void dummy_intrcleanup(void); static void dummy_stabilize(void); @@ -66,8 +64,6 @@ struct machintr_abi MachIntrABI = { .intrdis = dummy_intrdis, .intren = dummy_intren, .vectorctl = dummy_vectorctl, - .setvar = dummy_setvar, - .getvar = dummy_getvar, .finalize = dummy_finalize, .cleanup = dummy_intrcleanup, .stabilize = dummy_stabilize @@ -90,18 +86,6 @@ dummy_vectorctl(int op, int intr, int flags) /* return (EOPNOTSUPP); */ } -static int -dummy_setvar(int varid, const void *buf) -{ - return (ENOENT); -} - -static int -dummy_getvar(int varid, void *buf) -{ - return (ENOENT); -} - static void dummy_finalize(void) { diff --git a/sys/sys/machintr.h b/sys/sys/machintr.h index 8b161ac0d7..ec9c8de2c0 100644 --- a/sys/sys/machintr.h +++ b/sys/sys/machintr.h @@ -44,10 +44,6 @@ enum machintr_type { MACHINTR_GENERIC, MACHINTR_ICU, MACHINTR_IOAPIC }; -#define MACHINTR_VAR_SIZEMASK 0xFFFF - -#define MACHINTR_VAR_IMCR_PRESENT (0x00010000|sizeof(int)) - #define MACHINTR_VECTOR_SETUP 1 #define MACHINTR_VECTOR_TEARDOWN 2 @@ -59,8 +55,6 @@ struct machintr_abi { void (*intrdis)(int); /* hardware disable irq */ void (*intren)(int); /* hardware enable irq */ int (*vectorctl)(int, int, int); /* hardware intr vector ctl */ - int (*setvar)(int, const void *); /* set miscellanious info */ - int (*getvar)(int, void *); /* get miscellanious info */ void (*finalize)(void); /* final before ints enabled */ void (*cleanup)(void); /* cleanup */ void (*setdefault)(void); /* set default vectors */ @@ -83,6 +77,5 @@ struct machintr_abi { #ifdef _KERNEL extern struct machintr_abi MachIntrABI; -extern int machintr_setvar_simple(int, int); #endif -- 2.41.0