[src/trunk]: src/sys/dev/acpi - don't evaluate _UID, reuse ACPI_DEVINFO

[kochi <kochi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf19b5f4423c
branches:  trunk
changeset: 565547:cf19b5f4423c
user:      kochi <kochi%NetBSD.org@localhost>
date:      Sun Apr 11 15:41:50 2004 +0000

description:
- don't evaluate _UID, reuse ACPI_DEVINFO
- move acpi_resources from acpi_ec_softc to stack

diffstat:

 sys/dev/acpi/acpi_ec.c |  26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diffs (88 lines):

diff -r 0e4eafbf20ba -r cf19b5f4423c sys/dev/acpi/acpi_ec.c
--- a/sys/dev/acpi/acpi_ec.c    Sun Apr 11 15:40:56 2004 +0000
+++ b/sys/dev/acpi/acpi_ec.c    Sun Apr 11 15:41:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_ec.c,v 1.27 2004/04/11 10:36:35 kochi Exp $       */
+/*     $NetBSD: acpi_ec.c,v 1.28 2004/04/11 15:41:50 kochi Exp $       */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -172,7 +172,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.27 2004/04/11 10:36:35 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.28 2004/04/11 15:41:50 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -197,8 +197,6 @@
        struct device   sc_dev;         /* base device glue */
        ACPI_HANDLE sc_handle;          /* ACPI handle */
 
-       struct acpi_resources sc_res;   /* our bus resources */
-
        UINT32          sc_gpebit;      /* our GPE interrupt bit */
 
        bus_space_tag_t sc_data_st;     /* space tag for data register */
@@ -480,6 +478,7 @@
        struct acpi_ec_softc *sc = (void *) self;
        struct acpi_attach_args *aa = aux;
        struct acpi_io *io0, *io1;
+       struct acpi_resources res;
        ACPI_STATUS rv;
        ACPI_INTEGER v;
 
@@ -494,16 +493,17 @@
 
        /* Parse our resources. */
        ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "parsing EC resources\n"));
-       rv = acpi_resource_parse(&sc->sc_dev, aa->aa_node->ad_handle, "_CRS",
-           &sc->sc_res, &acpi_resource_parse_ops_default);
+       rv = acpi_resource_parse(&sc->sc_dev, sc->sc_handle, "_CRS",
+           &res, &acpi_resource_parse_ops_default);
        if (ACPI_FAILURE(rv))
                return;
 
-       rv = acpi_eval_integer(aa->aa_node->ad_handle, "_UID", &v);
+#define adi aa->aa_node->ad_devinfo
 
        /* check if we already attached EC via ECDT */
-       if (ACPI_SUCCESS(rv) && ecdt_sc && ecdt_sc->sc_uid == v) {
-
+       if (ecdt_sc &&
+           ((adi->Valid & ACPI_VALID_UID) == ACPI_VALID_UID) &&
+           ecdt_sc->sc_uid == strtoul(adi->UniqueId.Value, NULL, 10)) {
                /* detach all ECDT handles */
                rv = AcpiRemoveAddressSpaceHandler(ACPI_ROOT_OBJECT,
                    ACPI_ADR_SPACE_EC, EcSpaceHandler);
@@ -525,8 +525,10 @@
                ecdt_sc = NULL;
        }
 
+#undef adi
+
        sc->sc_data_st = aa->aa_iot;
-       io0 = acpi_res_io(&sc->sc_res, 0);
+       io0 = acpi_res_io(&res, 0);
        if (io0 == NULL) {
                printf("%s: unable to find data register resource\n",
                    sc->sc_dev.dv_xname);
@@ -540,7 +542,7 @@
        }
 
        sc->sc_csr_st = aa->aa_iot;
-       io1 = acpi_res_io(&sc->sc_res, 1);
+       io1 = acpi_res_io(&res, 1);
        if (io1 == NULL) {
                printf("%s: unable to find csr register resource\n",
                    sc->sc_dev.dv_xname);
@@ -608,7 +610,7 @@
        }
 
  out:
-       acpi_resource_cleanup(&sc->sc_res);
+       acpi_resource_cleanup(&res);
        return_VOID;
 }