Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust to the new apm backend.

This commit is contained in:
christos 2006-07-08 20:28:06 +00:00
parent 3c00d4c7e1
commit 1b36a60be8
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/i386/conf/GENERIC_LAPTOP
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_LAPTOP,v 1.189 2006/06/19 15:44:44 gdamore Exp $
# $NetBSD: GENERIC_LAPTOP,v 1.190 2006/07/08 20:28:06 christos Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
#
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.189 $"
#ident "GENERIC-$Revision: 1.190 $"
maxusers 32 # estimated number of users
@ -249,7 +249,7 @@ mainbus0 at root
cpu0 at mainbus0
#ioapic* at mainbus?
apm0 at mainbus0 # Advanced power management
apm* at mainbus0 # Advanced power management
# Tuning for power management, see apm(4) for more details.
#options APM_NO_IDLE # Don't call BIOS CPU idle function
@ -269,6 +269,7 @@ acpi0 at mainbus0
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
# ACPI devices
#apm* at acpi? # ACPI apm emulation
#acpiacad* at acpi? # ACPI AC Adapter
#acpibat* at acpi? # ACPI Battery
#acpibut* at acpi? # ACPI Button

20
sys/arch/i386/conf/files.i386
View File

@ -1,4 +1,4 @@
# $NetBSD: files.i386,v 1.289 2006/06/19 15:44:44 gdamore Exp $
# $NetBSD: files.i386,v 1.290 2006/07/08 20:28:06 christos Exp $
#
# new style config file for i386 architecture
#
@ -10,13 +10,6 @@ maxusers 2 16 128
defparam opt_kernbase.h KERNBASE
# APM options
defflag opt_apm.h APM_DISABLE APM_FORCE_64K_SEGMENTS APM_NO_IDLE
APM_NO_STANDBY APM_V10_ONLY APM_NO_V12 APMDEBUG
APM_POWER_PRINT APM_ALLOW_BOGUS_SEGMENTS
APM_USE_KVM86
defparam opt_apm.h APMDEBUG_VALUE APM_DISABLE_INTERRUPTS
# Processor type options.
defflag opt_cputype.h I386_CPU I486_CPU I586_CPU I686_CPU
@ -335,11 +328,12 @@ include "dev/gpib/files.gpib"
# Other mainbus-attached devices
#
include "dev/apm/files.apm"
# Advanced Power Management support (APM)
device apm: bioscall
attach apm at apmbus
file arch/i386/i386/apm.c apm needs-count
file arch/i386/i386/apmcall.S apm
attach apm at apmbus with apmbios: bioscall
file arch/i386/i386/apmbios.c apmbios needs-flag
file arch/i386/i386/apmcall.S apmbios
# CPUS
@ -508,7 +502,7 @@ defflag opt_vesabios.h VESABIOSVERBOSE
include "dev/rasops/files.rasops"
device vesafb: wsemuldisplaydev, vcons, rasops8, rasops16, rasops32, splash
device vesafb: wsemuldisplaydev, vcons, rasops8, rasops16, rasops32, splash, bioscall
attach vesafb at vesabios
file arch/i386/bios/vesafb.c vesafb needs-flag
defparam opt_vesafb.h VESAFB_WIDTH VESAFB_HEIGHT VESAFB_DEPTH