Index: conf/files =================================================================== RCS file: /home/ncvs/src/sys/conf/files,v retrieving revision 1.726 diff -u -r1.726 files --- conf/files 2002/10/23 15:53:08 1.726 +++ conf/files 2002/10/24 18:48:37 @@ -65,123 +65,123 @@ coda/coda_vfsops.c optional vcoda coda/coda_vnops.c optional vcoda compat/linprocfs/linprocfs.c optional linprocfs -contrib/dev/acpica/dbcmds.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbdisply.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbexec.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbfileio.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbhistry.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbinput.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbstats.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbutils.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbxface.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmbuffer.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmnames.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmopcode.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmresrc.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmresrcl.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmresrcs.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmutils.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmwalk.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dsfield.c optional acpica nowerror -contrib/dev/acpica/dsmethod.c optional acpica -contrib/dev/acpica/dsmthdat.c optional acpica -contrib/dev/acpica/dsobject.c optional acpica -contrib/dev/acpica/dsopcode.c optional acpica nowerror -contrib/dev/acpica/dsutils.c optional acpica -contrib/dev/acpica/dswexec.c optional acpica -contrib/dev/acpica/dswload.c optional acpica -contrib/dev/acpica/dswscope.c optional acpica -contrib/dev/acpica/dswstate.c optional acpica -contrib/dev/acpica/evevent.c optional acpica -contrib/dev/acpica/evmisc.c optional acpica -contrib/dev/acpica/evregion.c optional acpica -contrib/dev/acpica/evrgnini.c optional acpica -contrib/dev/acpica/evsci.c optional acpica -contrib/dev/acpica/evxface.c optional acpica -contrib/dev/acpica/evxfevnt.c optional acpica -contrib/dev/acpica/evxfregn.c optional acpica -contrib/dev/acpica/exconfig.c optional acpica -contrib/dev/acpica/exconvrt.c optional acpica nowerror -contrib/dev/acpica/excreate.c optional acpica -contrib/dev/acpica/exdump.c optional acpica nowerror -contrib/dev/acpica/exfield.c optional acpica -contrib/dev/acpica/exfldio.c optional acpica -contrib/dev/acpica/exmisc.c optional acpica -contrib/dev/acpica/exmutex.c optional acpica -contrib/dev/acpica/exnames.c optional acpica -contrib/dev/acpica/exoparg1.c optional acpica -contrib/dev/acpica/exoparg2.c optional acpica -contrib/dev/acpica/exoparg3.c optional acpica -contrib/dev/acpica/exoparg6.c optional acpica nowerror -contrib/dev/acpica/exprep.c optional acpica -contrib/dev/acpica/exregion.c optional acpica -contrib/dev/acpica/exresnte.c optional acpica -contrib/dev/acpica/exresolv.c optional acpica -contrib/dev/acpica/exresop.c optional acpica nowerror -contrib/dev/acpica/exstore.c optional acpica -contrib/dev/acpica/exstoren.c optional acpica -contrib/dev/acpica/exstorob.c optional acpica -contrib/dev/acpica/exsystem.c optional acpica -contrib/dev/acpica/exutils.c optional acpica -contrib/dev/acpica/hwacpi.c optional acpica -contrib/dev/acpica/hwgpe.c optional acpica nowerror -contrib/dev/acpica/hwregs.c optional acpica nowerror -contrib/dev/acpica/hwsleep.c optional acpica -contrib/dev/acpica/hwtimer.c optional acpica -contrib/dev/acpica/nsaccess.c optional acpica -contrib/dev/acpica/nsalloc.c optional acpica -contrib/dev/acpica/nsdump.c optional acpica nowerror -contrib/dev/acpica/nseval.c optional acpica -contrib/dev/acpica/nsinit.c optional acpica -contrib/dev/acpica/nsload.c optional acpica -contrib/dev/acpica/nsnames.c optional acpica nowerror -contrib/dev/acpica/nsobject.c optional acpica -contrib/dev/acpica/nssearch.c optional acpica -contrib/dev/acpica/nsutils.c optional acpica -contrib/dev/acpica/nswalk.c optional acpica -contrib/dev/acpica/nsxfeval.c optional acpica nowerror -contrib/dev/acpica/nsxfname.c optional acpica nowerror -contrib/dev/acpica/nsxfobj.c optional acpica nowerror -contrib/dev/acpica/psargs.c optional acpica -contrib/dev/acpica/psfind.c optional acpica -contrib/dev/acpica/psopcode.c optional acpica -contrib/dev/acpica/psparse.c optional acpica -contrib/dev/acpica/psscope.c optional acpica -contrib/dev/acpica/pstree.c optional acpica -contrib/dev/acpica/psutils.c optional acpica -contrib/dev/acpica/pswalk.c optional acpica -contrib/dev/acpica/psxface.c optional acpica -contrib/dev/acpica/rsaddr.c optional acpica -contrib/dev/acpica/rscalc.c optional acpica -contrib/dev/acpica/rscreate.c optional acpica -contrib/dev/acpica/rsdump.c optional acpica nowerror -contrib/dev/acpica/rsio.c optional acpica -contrib/dev/acpica/rsirq.c optional acpica -contrib/dev/acpica/rslist.c optional acpica -contrib/dev/acpica/rsmemory.c optional acpica -contrib/dev/acpica/rsmisc.c optional acpica -contrib/dev/acpica/rsutils.c optional acpica -contrib/dev/acpica/rsxface.c optional acpica -contrib/dev/acpica/tbconvrt.c optional acpica -contrib/dev/acpica/tbget.c optional acpica -contrib/dev/acpica/tbgetall.c optional acpica -contrib/dev/acpica/tbinstal.c optional acpica -contrib/dev/acpica/tbrsdt.c optional acpica -contrib/dev/acpica/tbutils.c optional acpica -contrib/dev/acpica/tbxface.c optional acpica -contrib/dev/acpica/tbxfroot.c optional acpica -contrib/dev/acpica/utalloc.c optional acpica -contrib/dev/acpica/utclib.c optional acpica nowerror -contrib/dev/acpica/utcopy.c optional acpica nowerror -contrib/dev/acpica/utdebug.c optional acpica nowerror -contrib/dev/acpica/utdelete.c optional acpica -contrib/dev/acpica/uteval.c optional acpica -contrib/dev/acpica/utglobal.c optional acpica nowerror -contrib/dev/acpica/utinit.c optional acpica -contrib/dev/acpica/utmath.c optional acpica -contrib/dev/acpica/utmisc.c optional acpica nowerror -contrib/dev/acpica/utobject.c optional acpica nowerror -contrib/dev/acpica/utxface.c optional acpica +contrib/dev/acpi/dbcmds.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dbdisply.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dbexec.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dbfileio.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dbhistry.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dbinput.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dbstats.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dbutils.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dbxface.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dmbuffer.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dmnames.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dmopcode.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dmresrc.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dmresrcl.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dmresrcs.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dmutils.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dmwalk.c optional acpi acpi_debug nowerror +contrib/dev/acpi/dsfield.c optional acpi nowerror +contrib/dev/acpi/dsmethod.c optional acpi +contrib/dev/acpi/dsmthdat.c optional acpi +contrib/dev/acpi/dsobject.c optional acpi +contrib/dev/acpi/dsopcode.c optional acpi nowerror +contrib/dev/acpi/dsutils.c optional acpi +contrib/dev/acpi/dswexec.c optional acpi +contrib/dev/acpi/dswload.c optional acpi +contrib/dev/acpi/dswscope.c optional acpi +contrib/dev/acpi/dswstate.c optional acpi +contrib/dev/acpi/evevent.c optional acpi +contrib/dev/acpi/evmisc.c optional acpi +contrib/dev/acpi/evregion.c optional acpi +contrib/dev/acpi/evrgnini.c optional acpi +contrib/dev/acpi/evsci.c optional acpi +contrib/dev/acpi/evxface.c optional acpi +contrib/dev/acpi/evxfevnt.c optional acpi +contrib/dev/acpi/evxfregn.c optional acpi +contrib/dev/acpi/exconfig.c optional acpi +contrib/dev/acpi/exconvrt.c optional acpi nowerror +contrib/dev/acpi/excreate.c optional acpi +contrib/dev/acpi/exdump.c optional acpi nowerror +contrib/dev/acpi/exfield.c optional acpi +contrib/dev/acpi/exfldio.c optional acpi +contrib/dev/acpi/exmisc.c optional acpi +contrib/dev/acpi/exmutex.c optional acpi +contrib/dev/acpi/exnames.c optional acpi +contrib/dev/acpi/exoparg1.c optional acpi +contrib/dev/acpi/exoparg2.c optional acpi +contrib/dev/acpi/exoparg3.c optional acpi +contrib/dev/acpi/exoparg6.c optional acpi nowerror +contrib/dev/acpi/exprep.c optional acpi +contrib/dev/acpi/exregion.c optional acpi +contrib/dev/acpi/exresnte.c optional acpi +contrib/dev/acpi/exresolv.c optional acpi +contrib/dev/acpi/exresop.c optional acpi nowerror +contrib/dev/acpi/exstore.c optional acpi +contrib/dev/acpi/exstoren.c optional acpi +contrib/dev/acpi/exstorob.c optional acpi +contrib/dev/acpi/exsystem.c optional acpi +contrib/dev/acpi/exutils.c optional acpi +contrib/dev/acpi/hwacpi.c optional acpi +contrib/dev/acpi/hwgpe.c optional acpi nowerror +contrib/dev/acpi/hwregs.c optional acpi nowerror +contrib/dev/acpi/hwsleep.c optional acpi +contrib/dev/acpi/hwtimer.c optional acpi +contrib/dev/acpi/nsaccess.c optional acpi +contrib/dev/acpi/nsalloc.c optional acpi +contrib/dev/acpi/nsdump.c optional acpi nowerror +contrib/dev/acpi/nseval.c optional acpi +contrib/dev/acpi/nsinit.c optional acpi +contrib/dev/acpi/nsload.c optional acpi +contrib/dev/acpi/nsnames.c optional acpi nowerror +contrib/dev/acpi/nsobject.c optional acpi +contrib/dev/acpi/nssearch.c optional acpi +contrib/dev/acpi/nsutils.c optional acpi +contrib/dev/acpi/nswalk.c optional acpi +contrib/dev/acpi/nsxfeval.c optional acpi nowerror +contrib/dev/acpi/nsxfname.c optional acpi nowerror +contrib/dev/acpi/nsxfobj.c optional acpi nowerror +contrib/dev/acpi/psargs.c optional acpi +contrib/dev/acpi/psfind.c optional acpi +contrib/dev/acpi/psopcode.c optional acpi +contrib/dev/acpi/psparse.c optional acpi +contrib/dev/acpi/psscope.c optional acpi +contrib/dev/acpi/pstree.c optional acpi +contrib/dev/acpi/psutils.c optional acpi +contrib/dev/acpi/pswalk.c optional acpi +contrib/dev/acpi/psxface.c optional acpi +contrib/dev/acpi/rsaddr.c optional acpi +contrib/dev/acpi/rscalc.c optional acpi +contrib/dev/acpi/rscreate.c optional acpi +contrib/dev/acpi/rsdump.c optional acpi nowerror +contrib/dev/acpi/rsio.c optional acpi +contrib/dev/acpi/rsirq.c optional acpi +contrib/dev/acpi/rslist.c optional acpi +contrib/dev/acpi/rsmemory.c optional acpi +contrib/dev/acpi/rsmisc.c optional acpi +contrib/dev/acpi/rsutils.c optional acpi +contrib/dev/acpi/rsxface.c optional acpi +contrib/dev/acpi/tbconvrt.c optional acpi +contrib/dev/acpi/tbget.c optional acpi +contrib/dev/acpi/tbgetall.c optional acpi +contrib/dev/acpi/tbinstal.c optional acpi +contrib/dev/acpi/tbrsdt.c optional acpi +contrib/dev/acpi/tbutils.c optional acpi +contrib/dev/acpi/tbxface.c optional acpi +contrib/dev/acpi/tbxfroot.c optional acpi +contrib/dev/acpi/utalloc.c optional acpi +contrib/dev/acpi/utclib.c optional acpi nowerror +contrib/dev/acpi/utcopy.c optional acpi nowerror +contrib/dev/acpi/utdebug.c optional acpi nowerror +contrib/dev/acpi/utdelete.c optional acpi +contrib/dev/acpi/uteval.c optional acpi +contrib/dev/acpi/utglobal.c optional acpi nowerror +contrib/dev/acpi/utinit.c optional acpi +contrib/dev/acpi/utmath.c optional acpi +contrib/dev/acpi/utmisc.c optional acpi nowerror +contrib/dev/acpi/utobject.c optional acpi nowerror +contrib/dev/acpi/utxface.c optional acpi contrib/ipfilter/netinet/fil.c optional ipfilter inet contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet contrib/ipfilter/netinet/ip_fil.c optional ipfilter inet @@ -224,32 +224,32 @@ dev/aac/aac_pci.c optional aac pci dev/aac/aac_cam.c optional aacp aac dev/aac/aac_linux.c optional aac compat_linux -dev/acpica/acpi.c optional acpica -dev/acpica/acpica_support.c optional acpica -dev/acpica/acpi_acad.c optional acpica nowerror -dev/acpica/acpi_battery.c optional acpica -dev/acpica/acpi_button.c optional acpica -dev/acpica/acpi_cmbat.c optional acpica nowerror -dev/acpica/acpi_cpu.c optional acpica -dev/acpica/acpi_ec.c optional acpica -dev/acpica/acpi_lid.c optional acpica -dev/acpica/acpi_pci.c optional acpica pci -dev/acpica/acpi_pci_link.c optional acpica pci -dev/acpica/acpi_pcib.c optional acpica pci -dev/acpica/acpi_pcib_acpi.c optional acpica pci -dev/acpica/acpi_pcib_pci.c optional acpica pci -dev/acpica/acpi_powerres.c optional acpica nowerror -dev/acpica/acpi_resource.c optional acpica -dev/acpica/acpi_thermal.c optional acpica -dev/acpica/acpi_timer.c optional acpica -dev/acpica/Osd/OsdDebug.c optional acpica -dev/acpica/Osd/OsdHardware.c optional acpica -dev/acpica/Osd/OsdInterrupt.c optional acpica -dev/acpica/Osd/OsdMemory.c optional acpica -dev/acpica/Osd/OsdSchedule.c optional acpica -dev/acpica/Osd/OsdStream.c optional acpica -dev/acpica/Osd/OsdSynch.c optional acpica -dev/acpica/Osd/OsdTable.c optional acpica +dev/acpi/acpi.c optional acpi +dev/acpi/acpi_support.c optional acpi +dev/acpi/acpi_acad.c optional acpi nowerror +dev/acpi/acpi_battery.c optional acpi +dev/acpi/acpi_button.c optional acpi +dev/acpi/acpi_cmbat.c optional acpi nowerror +dev/acpi/acpi_cpu.c optional acpi +dev/acpi/acpi_ec.c optional acpi +dev/acpi/acpi_lid.c optional acpi +dev/acpi/acpi_pci.c optional acpi pci +dev/acpi/acpi_pci_link.c optional acpi pci +dev/acpi/acpi_pcib.c optional acpi pci +dev/acpi/acpi_pcib_acpi.c optional acpi pci +dev/acpi/acpi_pcib_pci.c optional acpi pci +dev/acpi/acpi_powerres.c optional acpi nowerror +dev/acpi/acpi_resource.c optional acpi +dev/acpi/acpi_thermal.c optional acpi +dev/acpi/acpi_timer.c optional acpi +dev/acpi/Osd/OsdDebug.c optional acpi +dev/acpi/Osd/OsdHardware.c optional acpi +dev/acpi/Osd/OsdInterrupt.c optional acpi +dev/acpi/Osd/OsdMemory.c optional acpi +dev/acpi/Osd/OsdSchedule.c optional acpi +dev/acpi/Osd/OsdStream.c optional acpi +dev/acpi/Osd/OsdSynch.c optional acpi +dev/acpi/Osd/OsdTable.c optional acpi dev/advansys/adv_eisa.c optional adv eisa dev/advansys/adv_pci.c optional adv pci dev/advansys/advansys.c optional adv Index: conf/files.i386 =================================================================== RCS file: /home/ncvs/src/sys/conf/files.i386,v retrieving revision 1.424 diff -u -r1.424 files.i386 --- conf/files.i386 2002/10/23 15:53:08 1.424 +++ conf/files.i386 2002/10/24 18:48:37 @@ -180,10 +180,10 @@ gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate -i386/acpica/OsdEnvironment.c optional acpica -i386/acpica/acpi_machdep.c optional acpica -i386/acpica/acpi_wakeup.c optional acpica -acpi_wakecode.h optional acpica \ +i386/acpi/OsdEnvironment.c optional acpi +i386/acpi/acpi_machdep.c optional acpi +i386/acpi/acpi_wakeup.c optional acpi +acpi_wakecode.h optional acpi \ dependency "$S/i386/acpica/acpi_wakecode.S" \ compile-with "${MAKE} -f $S/i386/acpica/Makefile MAKESRCPATH=$S/i386/acpica" \ no-obj no-implicit-rule before-depend \ Index: conf/files.ia64 =================================================================== RCS file: /home/ncvs/src/sys/conf/files.ia64,v retrieving revision 1.40 diff -u -r1.40 files.ia64 --- conf/files.ia64 2002/10/19 04:02:16 1.40 +++ conf/files.ia64 2002/10/24 18:48:37 @@ -18,10 +18,10 @@ no-obj no-implicit-rule before-depend \ clean "atkbdmap.h" # -ia64/acpica/acpi_machdep.c optional acpica -ia64/acpica/acpi_wakeup.c optional acpica -ia64/acpica/OsdEnvironment.c optional acpica -ia64/acpica/madt.c optional acpica +ia64/acpica/acpi_machdep.c optional acpi +ia64/acpica/acpi_wakeup.c optional acpi +ia64/acpica/OsdEnvironment.c optional acpi +ia64/acpica/madt.c optional acpi ia64/ia32/ia32_misc.c optional ia32 ia64/ia32/ia32_sysent.c optional ia32 ia64/ia32/ia32_sysvec.c optional ia32 Index: conf/options.ia64 =================================================================== RCS file: /home/ncvs/src/sys/conf/options.ia64,v retrieving revision 1.13 diff -u -r1.13 options.ia64 --- conf/options.ia64 2002/10/17 07:04:30 1.13 +++ conf/options.ia64 2002/10/24 18:48:37 @@ -71,4 +71,4 @@ # Device options DEV_SPLASH opt_splash.h -DEV_ACPICA opt_acpica.h +DEV_ACPI opt_acpi.h Index: i386/conf/NOTES =================================================================== RCS file: /home/ncvs/src/sys/i386/conf/NOTES,v retrieving revision 1.1053 diff -u -r1.1053 NOTES --- i386/conf/NOTES 2002/10/24 16:46:53 1.1053 +++ i386/conf/NOTES 2002/10/24 18:48:38 @@ -402,7 +402,7 @@ # Note that building ACPI into the kernel is deprecated; the module is # normally loaded automatically by the loader. # -device acpica +device acpi options ACPI_DEBUG # M-systems DiskOnchip products see src/sys/contrib/dev/fla/README Index: ia64/conf/GENERIC =================================================================== RCS file: /home/ncvs/src/sys/ia64/conf/GENERIC,v retrieving revision 1.40 diff -u -r1.40 GENERIC --- ia64/conf/GENERIC 2002/10/19 16:54:07 1.40 +++ ia64/conf/GENERIC 2002/10/24 18:48:38 @@ -70,7 +70,7 @@ device pci # IA64 uses ACPI -device acpica +device acpi # Floppy drives device fdc Index: ia64/ia64/machdep.c =================================================================== RCS file: /home/ncvs/src/sys/ia64/ia64/machdep.c,v retrieving revision 1.115 diff -u -r1.115 machdep.c --- ia64/ia64/machdep.c 2002/10/19 19:30:38 1.115 +++ ia64/ia64/machdep.c 2002/10/24 18:48:40 @@ -30,10 +30,10 @@ #include "opt_ddb.h" #include "opt_ski.h" #include "opt_msgbuf.h" -#include "opt_acpica.h" +#include "opt_acpi.h" -#if !defined(SKI) && !defined(DEV_ACPICA) -#error "You need the SKI option and/or the acpica device" +#if !defined(SKI) && !defined(DEV_ACPI) +#error "You need the SKI option and/or the acpi device" #endif #include @@ -232,7 +232,7 @@ vm_pager_bufferinit(); if (!ia64_running_in_simulator()) { -#ifdef DEV_ACPICA +#ifdef DEV_ACPI /* * Traverse the MADT to discover IOSAPIC and Local SAPIC * information. @@ -243,7 +243,7 @@ /* * It is an error to boot a SKI-only kernel on hardware. */ - panic("Mandatory 'device acpica' is missing"); + panic("Mandatory 'device acpi' is missing"); #endif } }