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

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

details:   https://anonhg.NetBSD.org/src/rev/34c9ac36804e
branches:  trunk
changeset: 559810:34c9ac36804e
user:      kanaoka <kanaoka%NetBSD.org@localhost>
date:      Wed Mar 24 11:26:46 2004 +0000

description:
Make it compile (int -> ACPI_INTEGER)

diffstat:

 sys/arch/i386/acpi/vald_acpi.c |   6 +++---
 sys/dev/acpi/acpi_acad.c       |   7 ++++---
 sys/dev/acpi/acpi_bat.c        |   7 ++++---
 sys/dev/acpi/acpi_ec.c         |  12 +++++++-----
 sys/dev/acpi/acpi_lid.c        |   6 +++---
 5 files changed, 21 insertions(+), 17 deletions(-)

diffs (166 lines):

diff -r 6a7e9f81ccb5 -r 34c9ac36804e sys/arch/i386/acpi/vald_acpi.c
--- a/sys/arch/i386/acpi/vald_acpi.c    Wed Mar 24 11:26:16 2004 +0000
+++ b/sys/arch/i386/acpi/vald_acpi.c    Wed Mar 24 11:26:46 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vald_acpi.c,v 1.17 2003/11/03 18:07:10 mycroft Exp $   */
+/*     $NetBSD: vald_acpi.c,v 1.18 2004/03/24 11:26:46 kanaoka Exp $   */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.17 2003/11/03 18:07:10 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.18 2004/03/24 11:26:46 kanaoka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -123,7 +123,7 @@
        int lcd_num;                    /* size of lcd brightness table */ 
        int lcd_index;                  /* index of lcd brightness table */
 
-       int     sc_ac_status;           /* AC adaptor status when attach */
+       ACPI_INTEGER sc_ac_status;      /* AC adaptor status when attach */
 };
 
 static const char * const vald_acpi_hids[] = {
diff -r 6a7e9f81ccb5 -r 34c9ac36804e sys/dev/acpi/acpi_acad.c
--- a/sys/dev/acpi/acpi_acad.c  Wed Mar 24 11:26:16 2004 +0000
+++ b/sys/dev/acpi/acpi_acad.c  Wed Mar 24 11:26:46 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_acad.c,v 1.12 2003/11/03 18:07:10 mycroft Exp $   */
+/*     $NetBSD: acpi_acad.c,v 1.13 2004/03/24 11:32:09 kanaoka Exp $   */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.12 2003/11/03 18:07:10 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.13 2004/03/24 11:32:09 kanaoka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -197,7 +197,8 @@
 acpiacad_get_status(void *arg)
 {
        struct acpiacad_softc *sc = arg;
-       int status, s;
+       ACPI_INTEGER status;
+       int s;
        ACPI_STATUS rv;
 
        rv = acpi_eval_integer(sc->sc_node->ad_handle, "_PSR", &status);
diff -r 6a7e9f81ccb5 -r 34c9ac36804e sys/dev/acpi/acpi_bat.c
--- a/sys/dev/acpi/acpi_bat.c   Wed Mar 24 11:26:16 2004 +0000
+++ b/sys/dev/acpi/acpi_bat.c   Wed Mar 24 11:26:46 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_bat.c,v 1.35 2003/11/03 18:07:10 mycroft Exp $    */
+/*     $NetBSD: acpi_bat.c,v 1.36 2004/03/24 11:32:09 kanaoka Exp $    */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.35 2003/11/03 18:07:10 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.36 2004/03/24 11:32:09 kanaoka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -351,7 +351,8 @@
 acpibat_battery_present(struct acpibat_softc *sc)
 {
        u_int32_t sta;
-       int s, val;
+       int s;
+       ACPI_INTEGER val;
        ACPI_STATUS rv;
 
        rv = acpi_eval_integer(sc->sc_node->ad_handle, "_STA", &val);
diff -r 6a7e9f81ccb5 -r 34c9ac36804e sys/dev/acpi/acpi_ec.c
--- a/sys/dev/acpi/acpi_ec.c    Wed Mar 24 11:26:16 2004 +0000
+++ b/sys/dev/acpi/acpi_ec.c    Wed Mar 24 11:26:46 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_ec.c,v 1.20 2003/11/12 13:59:23 yamt Exp $        */
+/*     $NetBSD: acpi_ec.c,v 1.21 2004/03/24 11:32:09 kanaoka Exp $     */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -172,7 +172,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.20 2003/11/12 13:59:23 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.21 2004/03/24 11:32:09 kanaoka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -400,6 +400,7 @@
        struct acpi_attach_args *aa = aux;
        struct acpi_io *io0, *io1;
        ACPI_STATUS rv;
+       ACPI_INTEGER v;
 
        ACPI_FUNCTION_TRACE(__FUNCTION__);
 
@@ -451,25 +452,26 @@
         * We evaluate the _GPE method to find the GPE bit used by the
         * Embedded Controller to signal status (SCI).
         */
-       rv = acpi_eval_integer(sc->sc_node->ad_handle, "_GPE", &sc->sc_gpebit);
+       rv = acpi_eval_integer(sc->sc_node->ad_handle, "_GPE", &v);
        if (ACPI_FAILURE(rv)) {
                printf("%s: unable to evaluate _GPE: %s\n",
                    sc->sc_dev.dv_xname, AcpiFormatException(rv));
                return;
        }
+       sc->sc_gpebit = v;
 
        /*
         * evaluate _GLK to see if we should acquire global lock
         * when accessing the EC.
         */
-       rv = acpi_eval_integer(sc->sc_node->ad_handle, "_GLK", &sc->sc_glk);
+       rv = acpi_eval_integer(sc->sc_node->ad_handle, "_GLK", &v);
        if (ACPI_FAILURE(rv)) {
                if (rv != AE_NOT_FOUND)
                        printf("%s: unable to evaluate _GLK: %s\n",
                            sc->sc_dev.dv_xname, AcpiFormatException(rv));
                sc->sc_glk = 0;
        }
-
+       sc->sc_glk = v;
        /*
         * Install a handler for this EC's GPE bit.  Note that EC SCIs are 
         * treated as both edge- and level-triggered interrupts; in other words
diff -r 6a7e9f81ccb5 -r 34c9ac36804e sys/dev/acpi/acpi_lid.c
--- a/sys/dev/acpi/acpi_lid.c   Wed Mar 24 11:26:16 2004 +0000
+++ b/sys/dev/acpi/acpi_lid.c   Wed Mar 24 11:26:46 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_lid.c,v 1.12 2003/11/03 18:07:10 mycroft Exp $    */
+/*     $NetBSD: acpi_lid.c,v 1.13 2004/03/24 11:32:09 kanaoka Exp $    */
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.12 2003/11/03 18:07:10 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.13 2004/03/24 11:32:09 kanaoka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -130,7 +130,7 @@
 acpilid_status_changed(void *arg)
 {
        struct acpilid_softc *sc = arg;
-       int status;
+       ACPI_INTEGER status;
        ACPI_STATUS rv;
 
        rv = acpi_eval_integer(sc->sc_node->ad_handle, "_LID", &status);