Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Make it compile (int -> ACPI_INTEGER)



details:   https://anonhg.NetBSD.org/src/rev/9f1293bb434a
branches:  trunk
changeset: 559807:9f1293bb434a
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Mar 24 09:14:58 2004 +0000

description:
Make it compile (int -> ACPI_INTEGER)

diffstat:

 sys/arch/x86/x86/mpacpi.c |   8 ++++----
 sys/dev/acpi/acpi_tz.c    |  14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs (96 lines):

diff -r 71c8aaeda8a1 -r 9f1293bb434a sys/arch/x86/x86/mpacpi.c
--- a/sys/arch/x86/x86/mpacpi.c Wed Mar 24 08:01:26 2004 +0000
+++ b/sys/arch/x86/x86/mpacpi.c Wed Mar 24 09:14:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpacpi.c,v 1.18 2004/03/23 14:07:42 kochi Exp $        */
+/*     $NetBSD: mpacpi.c,v 1.19 2004/03/24 09:15:38 martin Exp $       */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.18 2004/03/23 14:07:42 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.19 2004/03/24 09:15:38 martin Exp $");
 
 #include "opt_acpi.h"
 #include "opt_mpbios.h"
@@ -382,7 +382,7 @@
 {
        ACPI_STATUS ret;
        ACPI_BUFFER buf;
-       int val;
+       ACPI_INTEGER val;
        struct mpacpi_pcibus *mpr;
 
        ret = acpi_get(handle, &buf, AcpiGetIrqRoutingTable);
@@ -427,7 +427,7 @@
 mpacpi_pcihier_cb(ACPI_HANDLE handle, UINT32 level, void *ct, void **status)
 {
        ACPI_STATUS ret;
-       int val;
+       ACPI_INTEGER val;
        pcireg_t binf, class;
        pcitag_t tag;
        struct acpi_softc *acpi;
diff -r 71c8aaeda8a1 -r 9f1293bb434a sys/dev/acpi/acpi_tz.c
--- a/sys/dev/acpi/acpi_tz.c    Wed Mar 24 08:01:26 2004 +0000
+++ b/sys/dev/acpi/acpi_tz.c    Wed Mar 24 09:14:58 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.8 2004/02/02 10:36:19 soren Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.9 2004/03/24 09:14:58 martin Exp $ */
 
 /*
  * Copyright (c) 2003 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.8 2004/02/02 10:36:19 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.9 2004/03/24 09:14:58 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -144,6 +144,7 @@
        struct acpitz_softc *sc = (struct acpitz_softc *)self;
        struct acpi_attach_args *aa = aux;
        ACPI_STATUS rv;
+       ACPI_INTEGER v;
 
 #if 0
        sc->sc_flags = ATZ_F_VERBOSE;
@@ -152,13 +153,13 @@
 
        printf(": ACPI Thermal Zone\n");
 
-       rv = acpi_eval_integer(sc->sc_devnode->ad_handle, "_TZP",
-           &sc->sc_zone.tzp);
+       rv = acpi_eval_integer(sc->sc_devnode->ad_handle, "_TZP", &v);
        if (ACPI_FAILURE(rv)) {
                printf("%s: unable to get polling interval; using default of",
                    sc->sc_dev.dv_xname);
                sc->sc_zone.tzp = ATZ_TZP_RATE;
        } else {
+               sc->sc_zone.tzp = v;
                printf("%s: polling interval is", sc->sc_dev.dv_xname);
        }
        printf(" %d.%ds\n", sc->sc_zone.tzp / 10, sc->sc_zone.tsp % 10);
@@ -189,14 +190,15 @@
 {
        struct acpitz_softc *sc = opaque;
        ACPI_STATUS rv;
+       ACPI_INTEGER v;
 
-       rv = acpi_eval_integer(sc->sc_devnode->ad_handle, "_TMP",
-           &sc->sc_zone.tmp);
+       rv = acpi_eval_integer(sc->sc_devnode->ad_handle, "_TMP", &v);
        if (ACPI_FAILURE(rv)) {
                printf("%s: failed to evaluate _TMP: %s\n",
                    sc->sc_dev.dv_xname, AcpiFormatException(rv));
                return;
        }
+       sc->sc_zone.tmp = v;
 
        /*
         * The temperature unit for envsys(9) is microKelvin, so convert to



Home | Main Index | Thread Index | Old Index