Module Name: src
Committed By: cegger
Date: Tue May 12 09:50:29 UTC 2009
Modified Files:
src/sys/dev/acpi: acpi_bat.c acpi_resource.c acpivar.h wss_acpi.c
ym_acpi.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/acpi_resource.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpivar.h
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/acpi/wss_acpi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/ym_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_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.70 src/sys/dev/acpi/acpi_bat.c:1.71
--- src/sys/dev/acpi/acpi_bat.c:1.70 Tue May 12 09:29:46 2009
+++ src/sys/dev/acpi/acpi_bat.c Tue May 12 09:50:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.70 2009/05/12 09:29:46 cegger Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.71 2009/05/12 09:50:28 cegger Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.70 2009/05/12 09:29:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.71 2009/05/12 09:50:28 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,7 +166,7 @@
#define ABAT_ALV_STAT 3 /* battery status is available */
static int acpibat_match(device_t, cfdata_t, void *);
-static void acpibat_attach(device_t, struct device *, void *);
+static void acpibat_attach(device_t, device_t, void *);
static bool acpibat_resume(device_t PMF_FN_PROTO);
CFATTACH_DECL_NEW(acpibat, sizeof(struct acpibat_softc),
Index: src/sys/dev/acpi/acpi_resource.c
diff -u src/sys/dev/acpi/acpi_resource.c:1.27 src/sys/dev/acpi/acpi_resource.c:1.28
--- src/sys/dev/acpi/acpi_resource.c:1.27 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/acpi_resource.c Tue May 12 09:50:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.27 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.28 2009/05/12 09:50:28 cegger Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.27 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.28 2009/05/12 09:50:28 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@
struct resource_parse_callback_arg {
const struct acpi_resource_parse_ops *ops;
- struct device *dev;
+ device_t dev;
void *context;
};
@@ -334,7 +334,7 @@
* items, such as GPE bits.
*/
ACPI_STATUS
-acpi_resource_parse(struct device *dev, ACPI_HANDLE handle, const char *path,
+acpi_resource_parse(device_t dev, ACPI_HANDLE handle, const char *path,
void *arg, const struct acpi_resource_parse_ops *ops)
{
struct resource_parse_callback_arg cbarg;
@@ -369,7 +369,7 @@
* Print the resources assigned to a device.
*/
void
-acpi_resource_print(struct device *dev, struct acpi_resources *res)
+acpi_resource_print(device_t dev, struct acpi_resources *res)
{
const char *sep;
@@ -571,24 +571,24 @@
* Default ACPI resource parse operations.
*****************************************************************************/
-static void acpi_res_parse_init(struct device *, void *, void **);
-static void acpi_res_parse_fini(struct device *, void *);
+static void acpi_res_parse_init(device_t, void *, void **);
+static void acpi_res_parse_fini(device_t, void *);
-static void acpi_res_parse_ioport(struct device *, void *, uint32_t,
+static void acpi_res_parse_ioport(device_t, void *, uint32_t,
uint32_t);
-static void acpi_res_parse_iorange(struct device *, void *, uint32_t,
+static void acpi_res_parse_iorange(device_t, void *, uint32_t,
uint32_t, uint32_t, uint32_t);
-static void acpi_res_parse_memory(struct device *, void *, uint32_t,
+static void acpi_res_parse_memory(device_t, void *, uint32_t,
uint32_t);
-static void acpi_res_parse_memrange(struct device *, void *, uint32_t,
+static void acpi_res_parse_memrange(device_t, void *, uint32_t,
uint32_t, uint32_t, uint32_t);
-static void acpi_res_parse_irq(struct device *, void *, uint32_t, uint32_t);
-static void acpi_res_parse_drq(struct device *, void *, uint32_t);
+static void acpi_res_parse_irq(device_t, void *, uint32_t, uint32_t);
+static void acpi_res_parse_drq(device_t, void *, uint32_t);
-static void acpi_res_parse_start_dep(struct device *, void *, int);
-static void acpi_res_parse_end_dep(struct device *, void *);
+static void acpi_res_parse_start_dep(device_t, void *, int);
+static void acpi_res_parse_end_dep(device_t, void *);
const struct acpi_resource_parse_ops acpi_resource_parse_ops_default = {
.init = acpi_res_parse_init,
@@ -608,7 +608,7 @@
};
static void
-acpi_res_parse_init(struct device *dev, void *arg, void **contextp)
+acpi_res_parse_init(device_t dev, void *arg, void **contextp)
{
struct acpi_resources *res = arg;
@@ -634,7 +634,7 @@
}
static void
-acpi_res_parse_fini(struct device *dev, void *context)
+acpi_res_parse_fini(device_t dev, void *context)
{
struct acpi_resources *res = context;
@@ -643,7 +643,7 @@
}
static void
-acpi_res_parse_ioport(struct device *dev, void *context, uint32_t base,
+acpi_res_parse_ioport(device_t dev, void *context, uint32_t base,
uint32_t length)
{
struct acpi_resources *res = context;
@@ -688,7 +688,7 @@
}
static void
-acpi_res_parse_iorange(struct device *dev, void *context, uint32_t low,
+acpi_res_parse_iorange(device_t dev, void *context, uint32_t low,
uint32_t high, uint32_t length, uint32_t align)
{
struct acpi_resources *res = context;
@@ -712,7 +712,7 @@
}
static void
-acpi_res_parse_memory(struct device *dev, void *context, uint32_t base,
+acpi_res_parse_memory(device_t dev, void *context, uint32_t base,
uint32_t length)
{
struct acpi_resources *res = context;
@@ -734,7 +734,7 @@
}
static void
-acpi_res_parse_memrange(struct device *dev, void *context, uint32_t low,
+acpi_res_parse_memrange(device_t dev, void *context, uint32_t low,
uint32_t high, uint32_t length, uint32_t align)
{
struct acpi_resources *res = context;
@@ -758,7 +758,7 @@
}
static void
-acpi_res_parse_irq(struct device *dev, void *context, uint32_t irq, uint32_t type)
+acpi_res_parse_irq(device_t dev, void *context, uint32_t irq, uint32_t type)
{
struct acpi_resources *res = context;
struct acpi_irq *ar;
@@ -779,7 +779,7 @@
}
static void
-acpi_res_parse_drq(struct device *dev, void *context, uint32_t drq)
+acpi_res_parse_drq(device_t dev, void *context, uint32_t drq)
{
struct acpi_resources *res = context;
struct acpi_drq *ar;
@@ -799,7 +799,7 @@
}
static void
-acpi_res_parse_start_dep(struct device *dev, void *context,
+acpi_res_parse_start_dep(device_t dev, void *context,
int preference)
{
@@ -807,7 +807,7 @@
}
static void
-acpi_res_parse_end_dep(struct device *dev, void *context)
+acpi_res_parse_end_dep(device_t dev, void *context)
{
/* Nothing to do. */
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.35 src/sys/dev/acpi/acpivar.h:1.36
--- src/sys/dev/acpi/acpivar.h:1.35 Wed Apr 8 00:23:30 2009
+++ src/sys/dev/acpi/acpivar.h Tue May 12 09:50:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.35 2009/04/08 00:23:30 dyoung Exp $ */
+/* $NetBSD: acpivar.h,v 1.36 2009/05/12 09:50:28 cegger Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -236,22 +236,22 @@
* when the resources are parsed.
*/
struct acpi_resource_parse_ops {
- void (*init)(struct device *, void *, void **);
- void (*fini)(struct device *, void *);
+ void (*init)(device_t, void *, void **);
+ void (*fini)(device_t, void *);
- void (*ioport)(struct device *, void *, uint32_t, uint32_t);
- void (*iorange)(struct device *, void *, uint32_t, uint32_t,
+ void (*ioport)(device_t, void *, uint32_t, uint32_t);
+ void (*iorange)(device_t, void *, uint32_t, uint32_t,
uint32_t, uint32_t);
- void (*memory)(struct device *, void *, uint32_t, uint32_t);
- void (*memrange)(struct device *, void *, uint32_t, uint32_t,
+ void (*memory)(device_t, void *, uint32_t, uint32_t);
+ void (*memrange)(device_t, void *, uint32_t, uint32_t,
uint32_t, uint32_t);
- void (*irq)(struct device *, void *, uint32_t, uint32_t);
- void (*drq)(struct device *, void *, uint32_t);
+ void (*irq)(device_t, void *, uint32_t, uint32_t);
+ void (*drq)(device_t, void *, uint32_t);
- void (*start_dep)(struct device *, void *, int);
- void (*end_dep)(struct device *, void *);
+ void (*start_dep)(device_t, void *, int);
+ void (*end_dep)(device_t, void *);
};
extern struct acpi_softc *acpi_softc;
@@ -276,9 +276,9 @@
ACPI_STATUS (*)(ACPI_HANDLE, ACPI_BUFFER *));
const char* acpi_name(ACPI_HANDLE);
-ACPI_STATUS acpi_resource_parse(struct device *, ACPI_HANDLE, const char *,
+ACPI_STATUS acpi_resource_parse(device_t, ACPI_HANDLE, const char *,
void *, const struct acpi_resource_parse_ops *);
-void acpi_resource_print(struct device *, struct acpi_resources *);
+void acpi_resource_print(device_t, struct acpi_resources *);
void acpi_resource_cleanup(struct acpi_resources *);
ACPI_STATUS acpi_allocate_resources(ACPI_HANDLE);
Index: src/sys/dev/acpi/wss_acpi.c
diff -u src/sys/dev/acpi/wss_acpi.c:1.22 src/sys/dev/acpi/wss_acpi.c:1.23
--- src/sys/dev/acpi/wss_acpi.c:1.22 Tue May 12 09:29:46 2009
+++ src/sys/dev/acpi/wss_acpi.c Tue May 12 09:50:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.22 2009/05/12 09:29:46 cegger Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.23 2009/05/12 09:50:28 cegger Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.22 2009/05/12 09:29:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.23 2009/05/12 09:50:28 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,8 +52,8 @@
#include <dev/isa/wssreg.h>
#include <dev/isa/wssvar.h>
-static int wss_acpi_match(struct device *, cfdata_t, void *);
-static void wss_acpi_attach(struct device *, struct device *, void *);
+static int wss_acpi_match(device_t, cfdata_t, void *);
+static void wss_acpi_attach(device_t, device_t, void *);
CFATTACH_DECL(wss_acpi, sizeof(struct wss_softc), wss_acpi_match,
wss_acpi_attach, NULL, NULL);
@@ -96,8 +96,7 @@
* wss_acpi_match: autoconf(9) match routine
*/
static int
-wss_acpi_match(struct device *parent, cfdata_t match,
- void *aux)
+wss_acpi_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -112,7 +111,7 @@
* wss_acpi_attach: autoconf(9) attach routine
*/
static void
-wss_acpi_attach(struct device *parent, struct device *self, void *aux)
+wss_acpi_attach(device_t parent, device_t self, void *aux)
{
struct wss_softc *sc = (struct wss_softc *)self;
struct acpi_attach_args *aa = aux;
Index: src/sys/dev/acpi/ym_acpi.c
diff -u src/sys/dev/acpi/ym_acpi.c:1.7 src/sys/dev/acpi/ym_acpi.c:1.8
--- src/sys/dev/acpi/ym_acpi.c:1.7 Tue May 12 09:29:46 2009
+++ src/sys/dev/acpi/ym_acpi.c Tue May 12 09:50:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_acpi.c,v 1.7 2009/05/12 09:29:46 cegger Exp $ */
+/* $NetBSD: ym_acpi.c,v 1.8 2009/05/12 09:50:28 cegger Exp $ */
/*
* Copyright (c) 2006 Jasper Wallace <[email protected]>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.7 2009/05/12 09:29:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.8 2009/05/12 09:50:28 cegger Exp $");
#include "mpu_ym.h"
@@ -48,8 +48,8 @@
#include <dev/isa/ymvar.h>
-static int ym_acpi_match(struct device *, cfdata_t, void *);
-static void ym_acpi_attach(struct device *, struct device *, void *);
+static int ym_acpi_match(device_t, cfdata_t, void *);
+static void ym_acpi_attach(device_t, device_t, void *);
CFATTACH_DECL(ym_acpi, sizeof(struct ym_softc), ym_acpi_match,
ym_acpi_attach, NULL, NULL);
@@ -58,8 +58,7 @@
* ym_acpi_match: autoconf(9) match routine
*/
static int
-ym_acpi_match(struct device *parent, cfdata_t match,
- void *aux)
+ym_acpi_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -76,7 +75,7 @@
* ym_acpi_attach: autoconf(9) attach routine
*/
static void
-ym_acpi_attach(struct device *parent, struct device *self, void *aux)
+ym_acpi_attach(device_t parent, device_t self, void *aux)
{
struct ym_softc *sc = (struct ym_softc *)self;
struct acpi_attach_args *aa = aux;
