git: 0f07c234ca1d - main - Remove more remnants of sio(4)
Mark Johnston
markj at FreeBSD.org
Wed Apr 7 18:33:11 UTC 2021
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=0f07c234ca1d3ccce158bb68c03829a266942c6e
commit 0f07c234ca1d3ccce158bb68c03829a266942c6e
Author: Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-04-07 18:21:07 +0000
Commit: Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-04-07 18:33:02 +0000
Remove more remnants of sio(4)
Reviewed by: imp
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D29626
---
sys/amd64/amd64/machdep.c | 22 ----------------------
sys/isa/isavar.h | 1 -
sys/kern/subr_witness.c | 1 -
sys/x86/isa/atpic.c | 15 ---------------
4 files changed, 39 deletions(-)
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 569e32207a2c..5c8a3ae6bb4e 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -959,28 +959,6 @@ ssdtosyssd(ssd, sd)
sd->sd_gran = ssd->ssd_gran;
}
-#if !defined(DEV_ATPIC) && defined(DEV_ISA)
-#include <isa/isavar.h>
-#include <isa/isareg.h>
-/*
- * Return a bitmap of the current interrupt requests. This is 8259-specific
- * and is only suitable for use at probe time.
- * This is only here to pacify sio. It is NOT FATAL if this doesn't work.
- * It shouldn't be here. There should probably be an APIC centric
- * implementation in the apic driver code, if at all.
- */
-intrmask_t
-isa_irq_pending(void)
-{
- u_char irr1;
- u_char irr2;
-
- irr1 = inb(IO_ICU1);
- irr2 = inb(IO_ICU2);
- return ((irr2 << 8) | irr1);
-}
-#endif
-
u_int basemem;
static int
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index d95a9c1ab3f2..81ba280da457 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -168,7 +168,6 @@ ISA_ACCESSOR(pnpbios_handle, PNPBIOS_HANDLE, int)
/* Device class for ISA bridges. */
extern devclass_t isab_devclass;
-extern intrmask_t isa_irq_pending(void);
extern void isa_probe_children(device_t dev);
void isa_dmacascade(int chan);
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 7e21db5d7c91..c849a191bf16 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -664,7 +664,6 @@ static struct witness_order_list_entry order_lists[] = {
{ "ap boot", &lock_class_mtx_spin },
#endif
{ "rm.mutex_mtx", &lock_class_mtx_spin },
- { "sio", &lock_class_mtx_spin },
#ifdef __i386__
{ "cy", &lock_class_mtx_spin },
#endif
diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c
index bb902610b0f4..07d63b041d0b 100644
--- a/sys/x86/isa/atpic.c
+++ b/sys/x86/isa/atpic.c
@@ -591,21 +591,6 @@ atpic_attach(device_t dev)
return (0);
}
-/*
- * Return a bitmap of the current interrupt requests. This is 8259-specific
- * and is only suitable for use at probe time.
- */
-intrmask_t
-isa_irq_pending(void)
-{
- u_char irr1;
- u_char irr2;
-
- irr1 = inb(IO_ICU1);
- irr2 = inb(IO_ICU2);
- return ((irr2 << 8) | irr1);
-}
-
static device_method_t atpic_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, atpic_probe),
More information about the dev-commits-src-all
mailing list