diff options
| -rw-r--r-- | sys/amd64/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/i386/apm/apm.c | 25 | ||||
| -rw-r--r-- | sys/i386/bios/apm.c | 25 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 2 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 2 |
7 files changed, 10 insertions, 50 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 950a471..ccb9bfd 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -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 diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 7ddb8b8..b9a8599 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -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. diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 307b697..246543e 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -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) diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 307b697..246543e 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -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) diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 950a471..ccb9bfd 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -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 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 7ddb8b8..b9a8599 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -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. diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 7ddb8b8..b9a8599 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -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. |
