diff options
| author | kochi <kochi@NetBSD.org> | 2003-07-06 04:03:21 +0000 |
|---|---|---|
| committer | kochi <kochi@NetBSD.org> | 2003-07-06 04:03:21 +0000 |
| commit | 9ab543513d2b58f2abe178ee2e99e7d72ea3cbac (patch) | |
| tree | c434e3d54f5723798fc1037f07ca3cc04365ea4d | |
| parent | 03c72d8b247816af2fd83bb08e91cfa0ac86267a (diff) | |
o cleanup usage of ACPI_ACTIVATE_DEV/ACPI_PCI_FIXUP
o delete usage of ENABLE_DEBUGGER
As ACPI_ACTIVATE_DEV/ACPI_PCI_FIXUP are defflag'ed in files.acpi,
these options don't have to have a value.
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC_LAPTOP | 8 | ||||
| -rw-r--r-- | sys/dev/acpi/acpi.c | 30 |
4 files changed, 22 insertions, 28 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index ebf547f9477..d943df52afa 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.5 2003/05/29 20:22:33 fvdl Exp $ +# $NetBSD: GENERIC,v 1.6 2003/07/06 04:03:21 kochi Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.5 $" +#ident "GENERIC-$Revision: 1.6 $" maxusers 32 # estimated number of users @@ -206,7 +206,7 @@ mainbus0 at root #options MPACPI #options MPACPI_SCANPCI # MPBIOS configures PCI roots #options ACPI_PCI_FIXUP # PCI interrupt routing via ACPI -#options ACPI_ACTIVATE_DEV=0 # If set, activate inactive devices +#options ACPI_ACTIVATE_DEV # If set, activate inactive devices # ACPI devices #acpiacad* at acpi? # ACPI AC Adapter diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 886d1c94460..b0724e9c6cd 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.564 2003/06/29 22:28:23 fvdl Exp $ +# $NetBSD: GENERIC,v 1.565 2003/07/06 04:03:21 kochi Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.564 $" +#ident "GENERIC-$Revision: 1.565 $" maxusers 32 # estimated number of users @@ -271,7 +271,7 @@ cpu* at mainbus? #acpi0 at mainbus0 #options ACPI_PCI_FIXUP # PCI interrupt routing via ACPI -#options ACPI_ACTIVATE_DEV=0 # If set, activate inactive devices +#options ACPI_ACTIVATE_DEV # If set, activate inactive devices # ACPI devices #acpiacad* at acpi? # ACPI AC Adapter diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP index 37638d58f6c..c649d306ab6 100644 --- a/sys/arch/i386/conf/GENERIC_LAPTOP +++ b/sys/arch/i386/conf/GENERIC_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_LAPTOP,v 1.74 2003/05/15 13:13:24 wiz Exp $ +# $NetBSD: GENERIC_LAPTOP,v 1.75 2003/07/06 04:03:21 kochi 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.74 $" +#ident "GENERIC-$Revision: 1.75 $" maxusers 32 # estimated number of users @@ -217,8 +217,8 @@ apm0 at mainbus0 # Advanced power management # Advanced Control and Power Interface #acpi0 at mainbus0 -#options ACPI_PCI_FIXUP=1 # PCI interrupt routing via ACPI -#options ACPI_ACTIVATE_DEV=0 # If set, activate inactive devices +#options ACPI_PCI_FIXUP # PCI interrupt routing via ACPI +#options ACPI_ACTIVATE_DEV # If set, activate inactive devices # ACPI devices #acpiacad* at acpi? # ACPI AC Adapter diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index ec45fffadd9..afa8396a2d8 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.39 2003/07/03 14:37:34 kochi Exp $ */ +/* $NetBSD: acpi.c,v 1.40 2003/07/06 04:03:22 kochi Exp $ */ /* * Copyright 2001, 2003 Wasabi Systems, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.39 2003/07/03 14:37:34 kochi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.40 2003/07/06 04:03:22 kochi Exp $"); #include "opt_acpi.h" @@ -60,10 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.39 2003/07/03 14:37:34 kochi Exp $"); #include <dev/acpi/acpidevs_data.h> #endif -#ifndef ACPI_ACTIVATE_DEV -#define ACPI_ACTIVATE_DEV 0 -#endif - #ifdef ACPI_PCI_FIXUP #include <dev/acpi/acpica/Subsystem/acnamesp.h> /* AcpiNsGetNodeByPath() */ #include <dev/pci/pcidevs.h> @@ -73,9 +69,7 @@ MALLOC_DECLARE(M_ACPI); #include <machine/acpi_machdep.h> -#undef ENABLE_DEBUGGER - -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER #define ACPI_DBGR_INIT 0x01 #define ACPI_DBGR_TABLES 0x02 #define ACPI_DBGR_ENABLE 0x04 @@ -126,7 +120,7 @@ void acpi_enable_fixed_events(struct acpi_softc *); #ifdef ACPI_PCI_FIXUP void acpi_pci_fixup(struct acpi_softc *); #endif -#if defined(ACPI_PCI_FIXUP) || ACPI_ACTIVATE_DEV +#if defined(ACPI_PCI_FIXUP) || defined(ACPI_ACTIVATE_DEV) ACPI_STATUS acpi_allocate_resources(ACPI_HANDLE handle); #endif @@ -155,7 +149,7 @@ acpi_probe(void) /* * Start up ACPICA. */ -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER if (acpi_dbgr & ACPI_DBGR_INIT) acpi_osd_debugger(); #endif @@ -166,7 +160,7 @@ acpi_probe(void) return (0); } -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER if (acpi_dbgr & ACPI_DBGR_TABLES) acpi_osd_debugger(); #endif @@ -284,7 +278,7 @@ acpi_attach(struct device *parent, struct device *self, void *aux) * XXX We need to arrange for the object init pass after we have * XXX attached all of our children. */ -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER if (acpi_dbgr & ACPI_DBGR_ENABLE) acpi_osd_debugger(); #endif @@ -319,7 +313,7 @@ acpi_attach(struct device *parent, struct device *self, void *aux) /* * Scan the namespace and build our device tree. */ -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER if (acpi_dbgr & ACPI_DBGR_PROBE) acpi_osd_debugger(); #endif @@ -336,7 +330,7 @@ acpi_attach(struct device *parent, struct device *self, void *aux) printf("%s: WARNING: unable to register shutdown hook\n", sc->sc_dev.dv_xname); -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER if (acpi_dbgr & ACPI_DBGR_RUNNING) acpi_osd_debugger(); #endif @@ -468,7 +462,7 @@ acpi_build_tree(struct acpi_softc *sc) } } -#if ACPI_ACTIVATE_DEV +#ifdef ACPI_ACTIVATE_DEV static void acpi_activate_device(ACPI_HANDLE handle, ACPI_DEVICE_INFO *di) { @@ -525,7 +519,7 @@ acpi_make_devnode(ACPI_HANDLE handle, UINT32 level, void *context, switch (type) { case ACPI_TYPE_DEVICE: -#if ACPI_ACTIVATE_DEV +#ifdef ACPI_ACTIVATE_DEV if ((devinfo.Valid & ACPI_VALID_STA) && (devinfo.CurrentStatus & (ACPI_STA_DEV_PRESENT|ACPI_STA_DEV_ENABLED)) == @@ -1209,7 +1203,7 @@ acpi_pci_fixup_bus(ACPI_HANDLE handle, UINT32 level, void *context, } #endif /* ACPI_PCI_FIXUP */ -#if defined(ACPI_PCI_FIXUP) || ACPI_ACTIVATE_DEV +#if defined(ACPI_PCI_FIXUP) || defined(ACPI_ACTIVATE_DEV) /* XXX This very incomplete */ ACPI_STATUS acpi_allocate_resources(ACPI_HANDLE handle) |
