summaryrefslogtreecommitdiffstats
path: root/sys/i386/bios/apm.c
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2004-10-14 22:21:59 +0000
committernjl <njl@FreeBSD.org>2004-10-14 22:21:59 +0000
commit48e4157e91b19dd6052373a6bdcadbe4f11313c2 (patch)
tree0f9116b3f1c78782e732cdc488fb4b329d06e0b3 /sys/i386/bios/apm.c
parentbcc253c05805e4d8d61f1a9af593a83806403580 (diff)
downloadFreeBSD-src-48e4157e91b19dd6052373a6bdcadbe4f11313c2.zip
FreeBSD-src-48e4157e91b19dd6052373a6bdcadbe4f11313c2.tar.gz
Remove local hacks to set flags now that the device probe does this for us.
Tested on every device except sio_pci and the pc98 fd.c. Perhaps something similar should be done for the "disabled" hints also. MFC after: 2 weeks
Diffstat (limited to 'sys/i386/bios/apm.c')
-rw-r--r--sys/i386/bios/apm.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 4aeedd1..dd5f635 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -864,7 +864,6 @@ apm_probe(device_t dev)
#define APM_KERNBASE KERNBASE
struct vm86frame vmf;
struct apm_softc *sc = &apm_softc;
- int flags;
#ifdef PC98
int rid;
#endif
@@ -881,9 +880,6 @@ apm_probe(device_t dev)
return ENXIO;
}
- if (resource_int_value("apm", 0, "flags", &flags) != 0)
- flags = 0;
-
bzero(&vmf, sizeof(struct vm86frame)); /* safety */
bzero(&apm_softc, sizeof(apm_softc));
vmf.vmf_ah = APM_BIOS;
@@ -1123,16 +1119,12 @@ static int
apm_attach(device_t dev)
{
struct apm_softc *sc = &apm_softc;
- int flags;
int drv_version;
#ifdef PC98
int rid;
#endif
- if (resource_int_value("apm", 0, "flags", &flags) != 0)
- flags = 0;
-
- if (flags & 0x20)
+ if (device_get_flags(dev) & 0x20)
statclock_disable = 1;
sc->initialized = 0;
OpenPOWER on IntegriCloud