Module Name: src
Committed By: jruoho
Date: Wed Apr 14 19:27:28 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_bat.c acpi_ec.c acpi_lid.c
acpi_pci_link.c acpi_tz.c asus_acpi.c dalb_acpi.c fdc_acpi.c
sony_acpi.c thinkpad_acpi.c vald_acpi.c valz_acpi.c
Log Message:
No need to spread the ACPICA type system any more than is necessary:
UINT8 -> uint8_t and UINT32 -> uint32_t.
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/acpi_pci_link.c \
src/sys/dev/acpi/sony_acpi.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/acpi/acpi_tz.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/asus_acpi.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/acpi/dalb_acpi.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/acpi/fdc_acpi.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/vald_acpi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/valz_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.172 src/sys/dev/acpi/acpi.c:1.173
--- src/sys/dev/acpi/acpi.c:1.172 Wed Apr 14 18:39:56 2010
+++ src/sys/dev/acpi/acpi.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.172 2010/04/14 18:39:56 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.173 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.172 2010/04/14 18:39:56 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.173 2010/04/14 19:27:28 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -784,13 +784,14 @@
resc = ACPI_NEXT_RESOURCE(resc);
resn = ACPI_NEXT_RESOURCE(resn);
resp = ACPI_NEXT_RESOURCE(resp);
- delta = (UINT8 *)resn - (UINT8 *)bufn.Pointer;
+ delta = (uint8_t *)resn - (uint8_t *)bufn.Pointer;
if (delta >=
bufn.Length-ACPI_RS_SIZE(ACPI_RESOURCE_DATA)) {
bufn.Length *= 2;
bufn.Pointer = realloc(bufn.Pointer, bufn.Length,
M_ACPI, M_WAITOK);
- resn = (ACPI_RESOURCE *)((UINT8 *)bufn.Pointer + delta);
+ resn = (ACPI_RESOURCE *)((uint8_t *)bufn.Pointer +
+ delta);
}
}
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.98 src/sys/dev/acpi/acpi_bat.c:1.99
--- src/sys/dev/acpi/acpi_bat.c:1.98 Sat Apr 3 16:29:22 2010
+++ src/sys/dev/acpi/acpi_bat.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.98 2010/04/03 16:29:22 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.99 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.98 2010/04/03 16:29:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.99 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -182,7 +182,7 @@
static void acpibat_update_info(void *);
static void acpibat_update_status(void *);
static void acpibat_init_envsys(device_t);
-static void acpibat_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void acpibat_notify_handler(ACPI_HANDLE, uint32_t, void *);
static void acpibat_refresh(struct sysmon_envsys *, envsys_data_t *);
static bool acpibat_resume(device_t, const pmf_qual_t *);
static void acpibat_get_limits(struct sysmon_envsys *, envsys_data_t *,
@@ -652,7 +652,7 @@
* Callback from ACPI interrupt handler to notify us of an event.
*/
static void
-acpibat_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
+acpibat_notify_handler(ACPI_HANDLE handle, uint32_t notify, void *context)
{
static const int handler = OSL_NOTIFY_HANDLER;
device_t dv = context;
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.64 src/sys/dev/acpi/acpi_ec.c:1.65
--- src/sys/dev/acpi/acpi_ec.c:1.64 Mon Mar 29 16:35:59 2010
+++ src/sys/dev/acpi/acpi_ec.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.64 2010/03/29 16:35:59 dyoung Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.65 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.64 2010/03/29 16:35:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.65 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -122,7 +122,7 @@
ACPI_HANDLE sc_ech;
ACPI_HANDLE sc_gpeh;
- UINT8 sc_gpebit;
+ uint8_t sc_gpebit;
bus_space_tag_t sc_data_st;
bus_space_handle_t sc_data_sh;
@@ -131,7 +131,7 @@
bus_space_handle_t sc_csr_sh;
bool sc_need_global_lock;
- UINT32 sc_global_lock;
+ uint32_t sc_global_lock;
kmutex_t sc_mtx, sc_access_mtx;
kcondvar_t sc_cv, sc_cv_sci;
@@ -161,10 +161,10 @@
static void acpiec_callout(void *);
static void acpiec_gpe_query(void *);
-static UINT32 acpiec_gpe_handler(void *);
-static ACPI_STATUS acpiec_space_setup(ACPI_HANDLE, UINT32, void *, void **);
-static ACPI_STATUS acpiec_space_handler(UINT32, ACPI_PHYSICAL_ADDRESS,
- UINT32, ACPI_INTEGER *, void *, void *);
+static uint32_t acpiec_gpe_handler(void *);
+static ACPI_STATUS acpiec_space_setup(ACPI_HANDLE, uint32_t, void *, void **);
+static ACPI_STATUS acpiec_space_handler(uint32_t, ACPI_PHYSICAL_ADDRESS,
+ uint32_t, ACPI_INTEGER *, void *, void *);
static void acpiec_gpe_state_machine(device_t);
@@ -511,7 +511,7 @@
}
static ACPI_STATUS
-acpiec_space_setup(ACPI_HANDLE region, UINT32 func, void *arg,
+acpiec_space_setup(ACPI_HANDLE region, uint32_t func, void *arg,
void **region_arg)
{
if (func == ACPI_REGION_DEACTIVATE)
@@ -652,8 +652,8 @@
}
static ACPI_STATUS
-acpiec_space_handler(UINT32 func, ACPI_PHYSICAL_ADDRESS paddr,
- UINT32 width, ACPI_INTEGER *value, void *arg, void *region_arg)
+acpiec_space_handler(uint32_t func, ACPI_PHYSICAL_ADDRESS paddr,
+ uint32_t width, ACPI_INTEGER *value, void *arg, void *region_arg)
{
device_t dv;
struct acpiec_softc *sc;
@@ -856,7 +856,7 @@
mutex_exit(&sc->sc_mtx);
}
-static UINT32
+static uint32_t
acpiec_gpe_handler(void *arg)
{
device_t dv = arg;
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.37 src/sys/dev/acpi/acpi_lid.c:1.38
--- src/sys/dev/acpi/acpi_lid.c:1.37 Fri Mar 5 21:01:44 2010
+++ src/sys/dev/acpi/acpi_lid.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.37 2010/03/05 21:01:44 jruoho Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.38 2010/04/14 19:27:28 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.37 2010/03/05 21:01:44 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.38 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -68,7 +68,7 @@
static void acpilid_attach(device_t, device_t, void *);
static int acpilid_detach(device_t, int);
static void acpilid_status_changed(void *);
-static void acpilid_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void acpilid_notify_handler(ACPI_HANDLE, uint32_t, void *);
CFATTACH_DECL_NEW(acpilid, sizeof(struct acpilid_softc),
acpilid_match, acpilid_attach, acpilid_detach, NULL);
Index: src/sys/dev/acpi/acpi_pci_link.c
diff -u src/sys/dev/acpi/acpi_pci_link.c:1.16 src/sys/dev/acpi/acpi_pci_link.c:1.17
--- src/sys/dev/acpi/acpi_pci_link.c:1.16 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/acpi_pci_link.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_link.c,v 1.16 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: acpi_pci_link.c,v 1.17 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2002 Mitsuru IWASAKI <iwas...@jp.freebsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.16 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.17 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -258,8 +258,8 @@
{
struct link_res_request *req;
struct link *link;
- UINT8 *irqs = NULL;
- UINT32 *ext_irqs = NULL;
+ uint8_t *irqs = NULL;
+ uint32_t *ext_irqs = NULL;
int i, is_ext_irq = 1;
req = (struct link_res_request *)context;
Index: src/sys/dev/acpi/sony_acpi.c
diff -u src/sys/dev/acpi/sony_acpi.c:1.16 src/sys/dev/acpi/sony_acpi.c:1.17
--- src/sys/dev/acpi/sony_acpi.c:1.16 Thu Apr 8 04:40:51 2010
+++ src/sys/dev/acpi/sony_acpi.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sony_acpi.c,v 1.16 2010/04/08 04:40:51 jruoho Exp $ */
+/* $NetBSD: sony_acpi.c,v 1.17 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.16 2010/04/08 04:40:51 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.17 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -84,12 +84,12 @@
static ACPI_STATUS sony_acpi_eval_set_integer(ACPI_HANDLE, const char *,
ACPI_INTEGER, ACPI_INTEGER *);
static void sony_acpi_quirk_setup(struct sony_acpi_softc *);
-static void sony_acpi_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void sony_acpi_notify_handler(ACPI_HANDLE, uint32_t, void *);
static bool sony_acpi_suspend(device_t, const pmf_qual_t *);
static bool sony_acpi_resume(device_t, const pmf_qual_t *);
static void sony_acpi_brightness_down(device_t);
static void sony_acpi_brightness_up(device_t);
-static ACPI_STATUS sony_acpi_find_pic(ACPI_HANDLE, UINT32, void *, void **);
+static ACPI_STATUS sony_acpi_find_pic(ACPI_HANDLE, uint32_t, void *, void **);
CFATTACH_DECL_NEW(sony_acpi, sizeof(struct sony_acpi_softc),
sony_acpi_match, sony_acpi_attach, NULL, NULL);
@@ -150,7 +150,7 @@
}
static ACPI_STATUS
-sony_walk_cb(ACPI_HANDLE hnd, UINT32 v, void *context, void **status)
+sony_walk_cb(ACPI_HANDLE hnd, uint32_t v, void *context, void **status)
{
struct sony_acpi_softc *sc = (void *)context;
const struct sysctlnode *node, *snode;
@@ -325,7 +325,7 @@
}
static void
-sony_acpi_notify_handler(ACPI_HANDLE hdl, UINT32 notify, void *opaque)
+sony_acpi_notify_handler(ACPI_HANDLE hdl, uint32_t notify, void *opaque)
{
device_t dv = opaque;
struct sony_acpi_softc *sc = device_private(dv);
@@ -441,7 +441,8 @@
}
static ACPI_STATUS
-sony_acpi_find_pic(ACPI_HANDLE hdl, UINT32 level, void *opaque, void **status)
+sony_acpi_find_pic(ACPI_HANDLE hdl, uint32_t level,
+ void *opaque, void **status)
{
struct sony_acpi_softc *sc = opaque;
ACPI_STATUS rv;
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.63 src/sys/dev/acpi/acpi_tz.c:1.64
--- src/sys/dev/acpi/acpi_tz.c:1.63 Wed Mar 17 20:29:32 2010
+++ src/sys/dev/acpi/acpi_tz.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.63 2010/03/17 20:29:32 jruoho Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.64 2010/04/14 19:27:28 jruoho Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.63 2010/03/17 20:29:32 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.64 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -78,33 +78,33 @@
struct acpitz_zone {
/* Active cooling temperature threshold */
- UINT32 ac[ATZ_NLEVELS];
+ uint32_t ac[ATZ_NLEVELS];
/* Package of references to all active cooling devices for a level */
ACPI_BUFFER al[ATZ_NLEVELS];
/* Critical temperature threshold for system shutdown */
- UINT32 crt;
+ uint32_t crt;
/* Critical temperature threshold for S4 sleep */
- UINT32 hot;
+ uint32_t hot;
/* Package of references to processor objects for passive cooling */
ACPI_BUFFER psl;
/* Conveys if temperatures are absolute or relative values. */
- UINT32 rtv;
+ uint32_t rtv;
/* Passive cooling temperature threshold */
- UINT32 psv;
+ uint32_t psv;
/* Thermal constants for use in passive cooling formulas */
- UINT32 tc1, tc2;
+ uint32_t tc1, tc2;
/* Current temperature of the thermal zone */
- UINT32 prevtmp, tmp;
+ uint32_t prevtmp, tmp;
/* Thermal sampling period for passive cooling, in tenths of seconds */
- UINT32 tsp;
+ uint32_t tsp;
/* Package of references to devices in this TZ (optional) */
ACPI_BUFFER tzd;
/* Recommended TZ polling frequency, in tenths of seconds */
- UINT32 tzp;
+ uint32_t tzp;
/* Thermal zone name */
char *name;
/* FAN min, max, current rpms */
- UINT32 fanmin, fanmax, fancurrent;
+ uint32_t fanmin, fanmax, fancurrent;
};
struct acpitz_softc {
@@ -130,19 +130,20 @@
static void acpitz_print_status(device_t);
static void acpitz_power_off(struct acpitz_softc *);
static void acpitz_power_zone(struct acpitz_softc *, int, int);
-static void acpitz_sane_temp(UINT32 *tmp);
+static void acpitz_sane_temp(uint32_t *tmp);
static ACPI_STATUS
acpitz_switch_cooler(ACPI_OBJECT *, void *);
-static void acpitz_notify_handler(ACPI_HANDLE, UINT32, void *);
-static int acpitz_get_integer(device_t, const char *, UINT32 *);
+static void acpitz_notify_handler(ACPI_HANDLE, uint32_t, void *);
+static int acpitz_get_integer(device_t, const char *, uint32_t *);
static void acpitz_tick(void *);
static void acpitz_init_envsys(device_t);
static void acpitz_get_limits(struct sysmon_envsys *, envsys_data_t *,
sysmon_envsys_lim_t *, uint32_t *);
-static int acpitz_get_fanspeed(device_t, UINT32 *, UINT32 *, UINT32 *);
+static int acpitz_get_fanspeed(device_t, uint32_t *,
+ uint32_t *, uint32_t *);
#ifdef notyet
static ACPI_STATUS
- acpitz_set_fanspeed(device_t, UINT32);
+ acpitz_set_fanspeed(device_t, uint32_t);
#endif
CFATTACH_DECL_NEW(acpitz, sizeof(struct acpitz_softc), acpitz_match,
@@ -238,9 +239,8 @@
{
device_t dv = opaque;
struct acpitz_softc *sc = device_private(dv);
- UINT32 tmp, active;
+ uint32_t tmp, active, fmin, fmax, fcurrent;
int i, flags;
- UINT32 fmin, fmax, fcurrent;
sc->sc_zone_expire--;
if (sc->sc_zone_expire <= 0) {
@@ -546,7 +546,7 @@
}
static void
-acpitz_notify_handler(ACPI_HANDLE hdl, UINT32 notify, void *opaque)
+acpitz_notify_handler(ACPI_HANDLE hdl, uint32_t notify, void *opaque)
{
device_t dv = opaque;
ACPI_OSD_EXEC_CALLBACK func = NULL;
@@ -577,7 +577,7 @@
}
static void
-acpitz_sane_temp(UINT32 *tmp)
+acpitz_sane_temp(uint32_t *tmp)
{
/* Sane temperatures are beteen 0 and 150 C */
if (*tmp < ATZ_ZEROC || *tmp > ATZ_ZEROC + 1500)
@@ -585,7 +585,7 @@
}
static int
-acpitz_get_integer(device_t dv, const char *cm, UINT32 *val)
+acpitz_get_integer(device_t dv, const char *cm, uint32_t *val)
{
struct acpitz_softc *sc = device_private(dv);
ACPI_STATUS rv;
@@ -610,7 +610,7 @@
static int
acpitz_get_fanspeed(device_t dv,
- UINT32 *fanmin, UINT32 *fanmax, UINT32 *fancurrent)
+ uint32_t *fanmin, uint32_t *fanmax, uint32_t *fancurrent)
{
struct acpitz_softc *sc = device_private(dv);
ACPI_STATUS rv;
@@ -646,7 +646,7 @@
#ifdef notyet
static ACPI_STATUS
-acpitz_set_fanspeed(device_t dv, UINT32 fanspeed)
+acpitz_set_fanspeed(device_t dv, uint32_t fanspeed)
{
struct acpitz_softc *sc = device_private(dv);
ACPI_STATUS rv;
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.18 src/sys/dev/acpi/asus_acpi.c:1.19
--- src/sys/dev/acpi/asus_acpi.c:1.18 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/asus_acpi.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.18 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.19 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.18 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.19 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -90,7 +90,7 @@
static void asus_attach(device_t, device_t, void *);
static int asus_detach(device_t, int);
-static void asus_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void asus_notify_handler(ACPI_HANDLE, uint32_t, void *);
static void asus_init(device_t);
static bool asus_suspend(device_t, const pmf_qual_t *);
@@ -205,7 +205,7 @@
}
static void
-asus_notify_handler(ACPI_HANDLE hdl, UINT32 notify, void *opaque)
+asus_notify_handler(ACPI_HANDLE hdl, uint32_t notify, void *opaque)
{
struct asus_softc *sc = opaque;
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.12 src/sys/dev/acpi/dalb_acpi.c:1.13
--- src/sys/dev/acpi/dalb_acpi.c:1.12 Sat Apr 10 18:32:13 2010
+++ src/sys/dev/acpi/dalb_acpi.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.12 2010/04/10 18:32:13 jruoho Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.13 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.12 2010/04/10 18:32:13 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.13 2010/04/14 19:27:28 jruoho Exp $");
/*
* Direct Application Launch Button:
@@ -61,7 +61,7 @@
static int acpi_dalb_match(device_t, cfdata_t, void *);
static void acpi_dalb_attach(device_t, device_t, void *);
static int acpi_dalb_detach(device_t, int);
-static void acpi_dalb_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void acpi_dalb_notify_handler(ACPI_HANDLE, uint32_t, void *);
static bool acpi_dalb_resume(device_t, const pmf_qual_t *);
static void acpi_dalb_get_wakeup_hotkeys(void *opaque);
@@ -198,7 +198,7 @@
}
static void
-acpi_dalb_notify_handler(ACPI_HANDLE hdl, UINT32 notify, void *opaque)
+acpi_dalb_notify_handler(ACPI_HANDLE hdl, uint32_t notify, void *opaque)
{
device_t dev = opaque;
struct acpi_dalb_softc *sc = device_private(dev);
Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.39 src/sys/dev/acpi/fdc_acpi.c:1.40
--- src/sys/dev/acpi/fdc_acpi.c:1.39 Sat Apr 10 18:32:13 2010
+++ src/sys/dev/acpi/fdc_acpi.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.39 2010/04/10 18:32:13 jruoho Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.40 2010/04/14 19:27:28 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.39 2010/04/10 18:32:13 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.40 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -225,7 +225,7 @@
ACPI_OBJECT *fde;
ACPI_BUFFER abuf;
ACPI_STATUS rv;
- UINT32 *p;
+ uint32_t *p;
int i, drives = -1;
rv = acpi_eval_struct(asc->sc_node->ad_handle, "_FDE", &abuf);
@@ -242,17 +242,17 @@
fde->Type);
goto out;
}
- if (fde->Buffer.Length < 5 * sizeof(UINT32)) {
+ if (fde->Buffer.Length < 5 * sizeof(uint32_t)) {
aprint_error_dev(sc->sc_dev,
"expected buffer len of %lu, got %u\n",
- (unsigned long)(5 * sizeof(UINT32)), fde->Buffer.Length);
+ (unsigned long)(5 * sizeof(uint32_t)), fde->Buffer.Length);
goto out;
}
- p = (UINT32 *) fde->Buffer.Pointer;
+ p = (uint32_t *)fde->Buffer.Pointer;
/*
- * Indexes 0 through 3 are each UINT32 booleans. True if a drive
+ * Indexes 0 through 3 are each uint32_t booleans. True if a drive
* is present.
*/
drives = 0;
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.28 src/sys/dev/acpi/thinkpad_acpi.c:1.29
--- src/sys/dev/acpi/thinkpad_acpi.c:1.28 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/thinkpad_acpi.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.28 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.29 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.28 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.29 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -113,7 +113,7 @@
static int thinkpad_detach(device_t, int);
static ACPI_STATUS thinkpad_mask_init(thinkpad_softc_t *, uint32_t);
-static void thinkpad_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void thinkpad_notify_handler(ACPI_HANDLE, uint32_t, void *);
static void thinkpad_get_hotkeys(void *);
static void thinkpad_sensors_init(thinkpad_softc_t *);
@@ -302,7 +302,7 @@
}
static void
-thinkpad_notify_handler(ACPI_HANDLE hdl, UINT32 notify, void *opaque)
+thinkpad_notify_handler(ACPI_HANDLE hdl, uint32_t notify, void *opaque)
{
thinkpad_softc_t *sc = (thinkpad_softc_t *)opaque;
device_t self = sc->sc_dev;
Index: src/sys/dev/acpi/vald_acpi.c
diff -u src/sys/dev/acpi/vald_acpi.c:1.2 src/sys/dev/acpi/vald_acpi.c:1.3
--- src/sys/dev/acpi/vald_acpi.c:1.2 Sat Apr 10 18:32:13 2010
+++ src/sys/dev/acpi/vald_acpi.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vald_acpi.c,v 1.2 2010/04/10 18:32:13 jruoho Exp $ */
+/* $NetBSD: vald_acpi.c,v 1.3 2010/04/14 19:27:28 jruoho Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.2 2010/04/10 18:32:13 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.3 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,26 +133,26 @@
static void vald_acpi_attach(device_t, device_t, void *);
static void vald_acpi_event(void *);
-static void vald_acpi_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void vald_acpi_notify_handler(ACPI_HANDLE, uint32_t, void *);
#define ACPI_NOTIFY_ValdStatusChanged 0x80
-static ACPI_STATUS vald_acpi_ghci_get(struct vald_acpi_softc *, UINT32,
- UINT32 *, UINT32 *);
-static ACPI_STATUS vald_acpi_ghci_set(struct vald_acpi_softc *, UINT32,
- UINT32, UINT32 *);
+static ACPI_STATUS vald_acpi_ghci_get(struct vald_acpi_softc *, uint32_t,
+ uint32_t *, uint32_t *);
+static ACPI_STATUS vald_acpi_ghci_set(struct vald_acpi_softc *, uint32_t,
+ uint32_t, uint32_t *);
-static ACPI_STATUS vald_acpi_libright_get_bus(ACPI_HANDLE, UINT32, void *,
- void **);
+static ACPI_STATUS vald_acpi_libright_get_bus(ACPI_HANDLE, uint32_t,
+ void *, void **);
static void vald_acpi_libright_get(struct vald_acpi_softc *);
static void vald_acpi_libright_set(struct vald_acpi_softc *, int);
static void vald_acpi_video_switch(struct vald_acpi_softc *);
static void vald_acpi_fan_switch(struct vald_acpi_softc *);
-static ACPI_STATUS vald_acpi_bcm_set(ACPI_HANDLE, UINT32);
-static ACPI_STATUS vald_acpi_dssx_set(UINT32);
+static ACPI_STATUS vald_acpi_bcm_set(ACPI_HANDLE, uint32_t);
+static ACPI_STATUS vald_acpi_dssx_set(uint32_t);
CFATTACH_DECL_NEW(vald_acpi, sizeof(struct vald_acpi_softc),
vald_acpi_match, vald_acpi_attach, NULL, NULL);
@@ -184,7 +184,7 @@
struct vald_acpi_softc *sc = device_private(self);
struct acpi_attach_args *aa = aux;
ACPI_STATUS rv;
- UINT32 value, result;
+ uint32_t value, result;
aprint_naive(": Toshiba VALD\n");
aprint_normal(": Toshiba VALD\n");
@@ -249,7 +249,7 @@
* Notify handler.
*/
static void
-vald_acpi_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
+vald_acpi_notify_handler(ACPI_HANDLE handle, uint32_t notify, void *context)
{
struct vald_acpi_softc *sc = context;
@@ -276,7 +276,7 @@
{
struct vald_acpi_softc *sc = arg;
ACPI_STATUS rv;
- UINT32 value, result;
+ uint32_t value, result;
while(1) {
rv = vald_acpi_ghci_get(sc, GHCI_SYSTEM_EVENT_FIFO, &value,
@@ -314,7 +314,7 @@
*/
static ACPI_STATUS
vald_acpi_ghci_get(struct vald_acpi_softc *sc,
- UINT32 reg, UINT32 *value, UINT32 *result)
+ uint32_t reg, uint32_t *value, uint32_t *result)
{
ACPI_STATUS rv;
ACPI_OBJECT Arg[GHCI_WORDS];
@@ -371,7 +371,7 @@
*/
static ACPI_STATUS
vald_acpi_ghci_set(struct vald_acpi_softc *sc,
- UINT32 reg, UINT32 value, UINT32 *result)
+ uint32_t reg, uint32_t value, uint32_t *result)
{
ACPI_STATUS rv;
ACPI_OBJECT Arg[GHCI_WORDS];
@@ -424,7 +424,7 @@
* and save this handle.
*/
static ACPI_STATUS
-vald_acpi_libright_get_bus(ACPI_HANDLE handle, UINT32 level,
+vald_acpi_libright_get_bus(ACPI_HANDLE handle, uint32_t level,
void *context, void **status)
{
struct vald_acpi_softc *sc = context;
@@ -512,9 +512,9 @@
static void
vald_acpi_libright_set(struct vald_acpi_softc *sc, int UpDown)
{
+ uint32_t backlight, backlight_new, result, bright;
ACPI_STATUS rv;
int *pi;
- UINT32 backlight, backlight_new, result, bright;
/* Skip,if it does not support _BCL. */
if (sc->lcd_handle == NULL)
@@ -589,7 +589,7 @@
vald_acpi_video_switch(struct vald_acpi_softc *sc)
{
ACPI_STATUS rv;
- UINT32 value, result;
+ uint32_t value, result;
/* Get video status. */
rv = vald_acpi_ghci_get(sc, GHCI_DISPLAY_DEVICE, &value, &result);
@@ -630,7 +630,7 @@
* Set LCD brightness via "_BCM" Method.
*/
static ACPI_STATUS
-vald_acpi_bcm_set(ACPI_HANDLE handle, UINT32 bright)
+vald_acpi_bcm_set(ACPI_HANDLE handle, uint32_t bright)
{
ACPI_STATUS rv;
ACPI_OBJECT Arg;
@@ -652,7 +652,7 @@
* Set value via "\\_SB_.VALX.DSSX" Method.
*/
static ACPI_STATUS
-vald_acpi_dssx_set(UINT32 value)
+vald_acpi_dssx_set(uint32_t value)
{
return acpi_eval_set_integer(NULL, "\\_SB_.VALX.DSSX", value);
}
@@ -666,7 +666,7 @@
vald_acpi_fan_switch(struct vald_acpi_softc *sc)
{
ACPI_STATUS rv;
- UINT32 value, result;
+ uint32_t value, result;
/* Get FAN status */
rv = vald_acpi_ghci_get(sc, GHCI_FAN, &value, &result);
Index: src/sys/dev/acpi/valz_acpi.c
diff -u src/sys/dev/acpi/valz_acpi.c:1.1 src/sys/dev/acpi/valz_acpi.c:1.2
--- src/sys/dev/acpi/valz_acpi.c:1.1 Sun Apr 11 22:42:30 2010
+++ src/sys/dev/acpi/valz_acpi.c Wed Apr 14 19:27:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: valz_acpi.c,v 1.1 2010/04/11 22:42:30 jakllsch Exp $ */
+/* $NetBSD: valz_acpi.c,v 1.2 2010/04/14 19:27:28 jruoho Exp $ */
/*
* Copyright (c) 2010 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: valz_acpi.c,v 1.1 2010/04/11 22:42:30 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: valz_acpi.c,v 1.2 2010/04/14 19:27:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,9 +54,9 @@
static int valz_match(device_t, cfdata_t, void *);
static void valz_attach(device_t, device_t, void *);
-static ACPI_STATUS valz_check_bcl(ACPI_HANDLE, UINT32, void*, void **);
+static ACPI_STATUS valz_check_bcl(ACPI_HANDLE, uint32_t, void*, void **);
static void valz_locate_lcd(struct valz_softc *);
-static void valz_lcd_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void valz_lcd_notify_handler(ACPI_HANDLE, uint32_t, void *);
static void valz_adjust_backlight(struct valz_softc *, enum valz_action);
static void valz_pmf_brightness_decrease(device_t);
static void valz_pmf_brightness_increase(device_t);
@@ -111,7 +111,7 @@
}
static void
-valz_lcd_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
+valz_lcd_notify_handler(ACPI_HANDLE handle, uint32_t notify, void *context)
{
struct valz_softc *sc = context;
@@ -145,7 +145,8 @@
}
static ACPI_STATUS
-valz_check_bcl(ACPI_HANDLE handle, UINT32 level, void *context, void **status)
+valz_check_bcl(ACPI_HANDLE handle, uint32_t level,
+ void *context, void **status)
{
struct valz_softc *sc = context;
ACPI_STATUS rv;
