Module Name: src
Committed By: cegger
Date: Tue May 12 09:29:47 UTC 2009
Modified Files:
src/sys/dev/acpi: acpi.c acpi_acad.c acpi_bat.c acpi_button.c acpi_ec.c
aiboost.c thinkpad_acpi.c wss_acpi.c ym_acpi.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/acpi/acpi_acad.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/acpi_button.c \
src/sys/dev/acpi/aiboost.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/acpi/wss_acpi.c
cvs rdiff -u -r1.6 -r1.7 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.c
diff -u src/sys/dev/acpi/acpi.c:1.125 src/sys/dev/acpi/acpi.c:1.126
--- src/sys/dev/acpi/acpi.c:1.125 Wed Apr 8 12:39:27 2009
+++ src/sys/dev/acpi/acpi.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.125 2009/04/08 12:39:27 joerg Exp $ */
+/* $NetBSD: acpi.c,v 1.126 2009/05/12 09:29:46 cegger Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.125 2009/04/08 12:39:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.126 2009/05/12 09:29:46 cegger Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -117,7 +117,7 @@
static ACPI_TABLE_DESC acpi_initial_tables[128];
-static int acpi_match(device_t, struct cfdata *, void *);
+static int acpi_match(device_t, cfdata_t, void *);
static void acpi_attach(device_t, device_t, void *);
static void acpi_childdet(device_t, device_t);
static int acpi_detach(device_t, int);
@@ -369,7 +369,7 @@
* Autoconfiguration `match' routine.
*/
static int
-acpi_match(device_t parent, struct cfdata *match, void *aux)
+acpi_match(device_t parent, cfdata_t match, void *aux)
{
/*
* XXX Check other locators? Hard to know -- machine
Index: src/sys/dev/acpi/acpi_acad.c
diff -u src/sys/dev/acpi/acpi_acad.c:1.33 src/sys/dev/acpi/acpi_acad.c:1.34
--- src/sys/dev/acpi/acpi_acad.c:1.33 Sun Mar 23 18:38:57 2008
+++ src/sys/dev/acpi/acpi_acad.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.33 2008/03/23 18:38:57 xtraeme Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.34 2009/05/12 09:29:46 cegger Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.33 2008/03/23 18:38:57 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.34 2009/05/12 09:29:46 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@
#define AACAD_CLEAR(sc, f) (void)((sc)->sc_flags &= ~(f))
#define AACAD_ISSET(sc, f) ((sc)->sc_flags & (f))
-static int acpiacad_match(device_t, struct cfdata *, void *);
+static int acpiacad_match(device_t, cfdata_t, void *);
static void acpiacad_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(acpiacad, sizeof(struct acpiacad_softc),
@@ -102,7 +102,7 @@
* Autoconfiguration `match' routine.
*/
static int
-acpiacad_match(device_t parent, struct cfdata *match, void *aux)
+acpiacad_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.69 src/sys/dev/acpi/acpi_bat.c:1.70
--- src/sys/dev/acpi/acpi_bat.c:1.69 Tue Jun 3 15:02:31 2008
+++ src/sys/dev/acpi/acpi_bat.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.69 2008/06/03 15:02:31 jmcneill Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.70 2009/05/12 09:29:46 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.69 2008/06/03 15:02:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.70 2009/05/12 09:29:46 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -165,7 +165,7 @@
#define ABAT_ALV_INFO 2 /* battery info is available */
#define ABAT_ALV_STAT 3 /* battery status is available */
-static int acpibat_match(device_t, struct cfdata *, void *);
+static int acpibat_match(device_t, cfdata_t, void *);
static void acpibat_attach(device_t, struct device *, void *);
static bool acpibat_resume(device_t PMF_FN_PROTO);
@@ -194,7 +194,7 @@
* Autoconfiguration `match' routine.
*/
static int
-acpibat_match(device_t parent, struct cfdata *match, void *aux)
+acpibat_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
Index: src/sys/dev/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.25 src/sys/dev/acpi/acpi_button.c:1.26
--- src/sys/dev/acpi/acpi_button.c:1.25 Sun Dec 9 20:27:52 2007
+++ src/sys/dev/acpi/acpi_button.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.25 2007/12/09 20:27:52 jmcneill Exp $ */
+/* $NetBSD: acpi_button.c,v 1.26 2009/05/12 09:29:46 cegger Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.25 2007/12/09 20:27:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.26 2009/05/12 09:29:46 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@
#define ACPIBUT_F_VERBOSE 0x01 /* verbose events */
-static int acpibut_match(device_t, struct cfdata *, void *);
+static int acpibut_match(device_t, cfdata_t, void *);
static void acpibut_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(acpibut, sizeof(struct acpibut_softc),
@@ -85,7 +85,7 @@
* Autoconfiguration `match' routine.
*/
static int
-acpibut_match(device_t parent, struct cfdata *match, void *aux)
+acpibut_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
Index: src/sys/dev/acpi/aiboost.c
diff -u src/sys/dev/acpi/aiboost.c:1.25 src/sys/dev/acpi/aiboost.c:1.26
--- src/sys/dev/acpi/aiboost.c:1.25 Tue May 20 14:46:31 2008
+++ src/sys/dev/acpi/aiboost.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aiboost.c,v 1.25 2008/05/20 14:46:31 cegger Exp $ */
+/* $NetBSD: aiboost.c,v 1.26 2009/05/12 09:29:46 cegger Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.25 2008/05/20 14:46:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.26 2009/05/12 09:29:46 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@
envsys_data_t *);
/* autoconf(9) glue */
-static int aiboost_acpi_match(device_t, struct cfdata *, void *);
+static int aiboost_acpi_match(device_t, cfdata_t, void *);
static void aiboost_acpi_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(aiboost, sizeof(struct aiboost_softc), aiboost_acpi_match,
@@ -94,7 +94,7 @@
};
static int
-aiboost_acpi_match(device_t parent, struct cfdata *match, void *aux)
+aiboost_acpi_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.54 src/sys/dev/acpi/acpi_ec.c:1.55
--- src/sys/dev/acpi/acpi_ec.c:1.54 Sat Feb 28 19:40:23 2009
+++ src/sys/dev/acpi/acpi_ec.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.54 2009/02/28 19:40:23 jmcneill Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.55 2009/05/12 09:29:46 cegger 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.54 2009/02/28 19:40:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.55 2009/05/12 09:29:46 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,10 +139,10 @@
uint8_t sc_cur_addr, sc_cur_val;
};
-static int acpiecdt_match(device_t, struct cfdata *, void *);
+static int acpiecdt_match(device_t, cfdata_t, void *);
static void acpiecdt_attach(device_t, device_t, void *);
-static int acpiec_match(device_t, struct cfdata *, void *);
+static int acpiec_match(device_t, cfdata_t, void *);
static void acpiec_attach(device_t, device_t, void *);
static void acpiec_common_attach(device_t, device_t, ACPI_HANDLE,
@@ -206,7 +206,7 @@
}
static int
-acpiecdt_match(device_t parent, struct cfdata *match, void *aux)
+acpiecdt_match(device_t parent, cfdata_t match, void *aux)
{
ACPI_HANDLE ec_handle;
bus_addr_t cmd_reg, data_reg;
@@ -236,7 +236,7 @@
}
static int
-acpiec_match(device_t parent, struct cfdata *match, void *aux)
+acpiec_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.18 src/sys/dev/acpi/thinkpad_acpi.c:1.19
--- src/sys/dev/acpi/thinkpad_acpi.c:1.18 Tue Feb 17 12:30:31 2009
+++ src/sys/dev/acpi/thinkpad_acpi.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.18 2009/02/17 12:30:31 jmcneill Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.19 2009/05/12 09:29:46 cegger 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.18 2009/02/17 12:30:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.19 2009/05/12 09:29:46 cegger Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -107,7 +107,7 @@
#define THINKPAD_DISPLAY_ALL \
(THINKPAD_DISPLAY_LCD | THINKPAD_DISPLAY_CRT | THINKPAD_DISPLAY_DVI)
-static int thinkpad_match(device_t, struct cfdata *, void *);
+static int thinkpad_match(device_t, cfdata_t, void *);
static void thinkpad_attach(device_t, device_t, void *);
static ACPI_STATUS thinkpad_mask_init(thinkpad_softc_t *, uint32_t);
@@ -136,7 +136,7 @@
};
static int
-thinkpad_match(device_t parent, struct cfdata *match, void *opaque)
+thinkpad_match(device_t parent, cfdata_t match, void *opaque)
{
struct acpi_attach_args *aa = (struct acpi_attach_args *)opaque;
ACPI_INTEGER ver;
Index: src/sys/dev/acpi/wss_acpi.c
diff -u src/sys/dev/acpi/wss_acpi.c:1.21 src/sys/dev/acpi/wss_acpi.c:1.22
--- src/sys/dev/acpi/wss_acpi.c:1.21 Sat Mar 14 15:36:16 2009
+++ src/sys/dev/acpi/wss_acpi.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.21 2009/03/14 15:36:16 dsl Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.22 2009/05/12 09:29:46 cegger Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.21 2009/03/14 15:36:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.22 2009/05/12 09:29:46 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@
#include <dev/isa/wssreg.h>
#include <dev/isa/wssvar.h>
-static int wss_acpi_match(struct device *, struct cfdata *, void *);
+static int wss_acpi_match(struct device *, cfdata_t, void *);
static void wss_acpi_attach(struct device *, struct device *, void *);
CFATTACH_DECL(wss_acpi, sizeof(struct wss_softc), wss_acpi_match,
@@ -96,7 +96,7 @@
* wss_acpi_match: autoconf(9) match routine
*/
static int
-wss_acpi_match(struct device *parent, struct cfdata *match,
+wss_acpi_match(struct device *parent, cfdata_t match,
void *aux)
{
struct acpi_attach_args *aa = aux;
Index: src/sys/dev/acpi/ym_acpi.c
diff -u src/sys/dev/acpi/ym_acpi.c:1.6 src/sys/dev/acpi/ym_acpi.c:1.7
--- src/sys/dev/acpi/ym_acpi.c:1.6 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/ym_acpi.c Tue May 12 09:29:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_acpi.c,v 1.6 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: ym_acpi.c,v 1.7 2009/05/12 09:29:46 cegger Exp $ */
/*
* Copyright (c) 2006 Jasper Wallace <jas...@pointless.net>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.6 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.7 2009/05/12 09:29:46 cegger Exp $");
#include "mpu_ym.h"
@@ -48,7 +48,7 @@
#include <dev/isa/ymvar.h>
-static int ym_acpi_match(struct device *, struct cfdata *, void *);
+static int ym_acpi_match(struct device *, cfdata_t, void *);
static void ym_acpi_attach(struct device *, struct device *, void *);
CFATTACH_DECL(ym_acpi, sizeof(struct ym_softc), ym_acpi_match,
@@ -58,7 +58,7 @@
* ym_acpi_match: autoconf(9) match routine
*/
static int
-ym_acpi_match(struct device *parent, struct cfdata *match,
+ym_acpi_match(struct device *parent, cfdata_t match,
void *aux)
{
struct acpi_attach_args *aa = aux;
