summaryrefslogtreecommitdiff
path: root/sys/dev/acpi
diff options
context:
space:
mode:
authordrochner <drochner@NetBSD.org>2004-08-30 15:05:15 +0000
committerdrochner <drochner@NetBSD.org>2004-08-30 15:05:15 +0000
commit46289e1fef5fa25a922e2a968d7fa98e43a0c809 (patch)
tree080859cbc4f0a6d9272ba00d1276ee6ee550d91b /sys/dev/acpi
parentd55b8a219009ead8fd52bed03a6f9559595c9fd8 (diff)
Phase out the use of a string as first "attach args" member to control
which bustype should be attached with a specific call to config_found() (from a "mainbus" or a bus bridge). Do it for isa/eisa/mca and pci/agp for now. These buses all attach to an mi interface attribute "isabus", "eisabus" etc., and the autoconf framework now allows to specify an interface attribute on config_found() and config_search(), which limits the search of matching config data to these which attach to that specific attribute. So we basically have to call config_found_ia(..., "foobus", ...) where such a bus is attached. As a consequence, where a "mainbus" or alike also attaches other devices (eg CPUs) which do not attach to a specific attribute yet, we need at least pass an attribute name (different from "foobus") so that the foo bus is not found at these places. This made some minor changes necessary which are not obviously related to the mentioned buses.
Diffstat (limited to 'sys/dev/acpi')
-rw-r--r--sys/dev/acpi/acpi.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index d79763026bf..339fd648ff1 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.66 2004/06/07 15:33:17 kochi Exp $ */
+/* $NetBSD: acpi.c,v 1.67 2004/08/30 15:05:19 drochner Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.66 2004/06/07 15:33:17 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.67 2004/08/30 15:05:19 drochner Exp $");
#include "opt_acpi.h"
@@ -223,11 +223,6 @@ acpi_probe(void)
static int
acpi_match(struct device *parent, struct cfdata *match, void *aux)
{
- struct acpibus_attach_args *aa = aux;
-
- if (strcmp(aa->aa_busname, acpi_cd.cd_name) != 0)
- return 0;
-
/*
* XXX Check other locators? Hard to know -- machine
* dependent code has already checked for the presence