d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove code to select APM version with flags to the apm0 device. This

Browse Source 
code has been disabled for the last 4 months.

Prodded into action by:	 n_hibma
This commit is contained in:
jlemon 1999-12-02 03:13:11 +00:00
parent 35dcdd8499
commit 8824ec0de5
7 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amd64/conf/GENERIC
View File

@ -152,7 +152,7 @@ device sc0 at isa?
device npx0 at nexus? port IO_NPX irq 13
# Power management support (see LINT for more options)
device apm0 at nexus? disable flags 0x31 # Advanced Power Management
device apm0 at nexus? disable flags 0x20 # Advanced Power Management
# PCCARD (PCMCIA) support
#controller card0

2
sys/conf/NOTES
View File

@ -1460,8 +1460,6 @@ device pca0 at isa? port IO_TIMER1
# Notes on APM
# The flags takes the following meaning for apm0:
# 0x0020 Statclock is broken.
# 0x0011 Limit APM protocol to 1.1 or 1.0
# 0x0010 Limit APM protocol to 1.0
# If apm is omitted, some systems require sysctl -w kern.timecounter.method=1
# for correct timekeeping.

25
sys/i386/apm/apm.c
View File

@ -1026,28 +1026,11 @@ apm_attach(device_t dev)
sc->bios.seg.code16.limit, sc->bios.seg.data.limit);
#endif /* APM_DEBUG */
#if 0
/*
* XXX this may not be needed anymore
*/
if ((flags & 0x10)) {
if ((flags & 0xf) >= 0x2) {
apm_driver_version(0x102);
}
if (!apm_version && (flags & 0xf) >= 0x1) {
apm_driver_version(0x101);
}
} else {
apm_driver_version(0x102);
if (!apm_version)
apm_driver_version(0x101);
}
#endif
/*
* In one test, apm bios version was 1.02; an attempt to register
* a 1.04 driver resulted in a 1.00 connection! Registering a
* 1.02 driver resulted in a 1.02 connection.
*/
* In one test, apm bios version was 1.02; an attempt to register
* a 1.04 driver resulted in a 1.00 connection! Registering a
* 1.02 driver resulted in a 1.02 connection.
*/
drv_version = apm_version > 0x102 ? 0x102 : apm_version;
for (; drv_version > 0x100; drv_version--)
if (apm_driver_version(drv_version) == 0)

25
sys/i386/bios/apm.c
View File

@ -1026,28 +1026,11 @@ apm_attach(device_t dev)
sc->bios.seg.code16.limit, sc->bios.seg.data.limit);
#endif /* APM_DEBUG */
#if 0
/*
* XXX this may not be needed anymore
*/
if ((flags & 0x10)) {
if ((flags & 0xf) >= 0x2) {
apm_driver_version(0x102);
}
if (!apm_version && (flags & 0xf) >= 0x1) {
apm_driver_version(0x101);
}
} else {
apm_driver_version(0x102);
if (!apm_version)
apm_driver_version(0x101);
}
#endif
/*
* In one test, apm bios version was 1.02; an attempt to register
* a 1.04 driver resulted in a 1.00 connection! Registering a
* 1.02 driver resulted in a 1.02 connection.
*/
* In one test, apm bios version was 1.02; an attempt to register
* a 1.04 driver resulted in a 1.00 connection! Registering a
* 1.02 driver resulted in a 1.02 connection.
*/
drv_version = apm_version > 0x102 ? 0x102 : apm_version;
for (; drv_version > 0x100; drv_version--)
if (apm_driver_version(drv_version) == 0)

2
sys/i386/conf/GENERIC
View File

@ -152,7 +152,7 @@ device sc0 at isa?
device npx0 at nexus? port IO_NPX irq 13
# Power management support (see LINT for more options)
device apm0 at nexus? disable flags 0x31 # Advanced Power Management
device apm0 at nexus? disable flags 0x20 # Advanced Power Management
# PCCARD (PCMCIA) support
#controller card0

2
sys/i386/conf/LINT
View File

@ -1460,8 +1460,6 @@ device pca0 at isa? port IO_TIMER1
# Notes on APM
# The flags takes the following meaning for apm0:
# 0x0020 Statclock is broken.
# 0x0011 Limit APM protocol to 1.1 or 1.0
# 0x0010 Limit APM protocol to 1.0
# If apm is omitted, some systems require sysctl -w kern.timecounter.method=1
# for correct timekeeping.

2
sys/i386/conf/NOTES
View File

@ -1460,8 +1460,6 @@ device pca0 at isa? port IO_TIMER1
# Notes on APM
# The flags takes the following meaning for apm0:
# 0x0020 Statclock is broken.
# 0x0011 Limit APM protocol to 1.1 or 1.0
# 0x0010 Limit APM protocol to 1.0
# If apm is omitted, some systems require sysctl -w kern.timecounter.method=1
# for correct timekeeping.