Module Name: src
Committed By: cegger
Date: Tue May 12 12:13:49 UTC 2009
Modified Files:
src/sys/dev/hpc: bivideo.c btnmgr.c button.c hpcapm.c hpcin.c
hpcioman.c hpckbd.c hpcout.c hpf1275a_tty.c pwctl.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/hpc/bivideo.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/hpc/btnmgr.c \
src/sys/dev/hpc/hpf1275a_tty.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/hpc/button.c src/sys/dev/hpc/hpcout.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/hpc/hpcapm.c \
src/sys/dev/hpc/hpcioman.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/hpc/hpcin.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/hpc/hpckbd.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/hpc/pwctl.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/hpc/bivideo.c
diff -u src/sys/dev/hpc/bivideo.c:1.28 src/sys/dev/hpc/bivideo.c:1.29
--- src/sys/dev/hpc/bivideo.c:1.28 Sun Apr 6 20:28:36 2008
+++ src/sys/dev/hpc/bivideo.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bivideo.c,v 1.28 2008/04/06 20:28:36 cegger Exp $ */
+/* $NetBSD: bivideo.c,v 1.29 2009/05/12 12:13:49 cegger Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.28 2008/04/06 20:28:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.29 2009/05/12 12:13:49 cegger Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -79,7 +79,7 @@
/*
* function prototypes
*/
-int bivideomatch(struct device *, struct cfdata *, void *);
+int bivideomatch(struct device *, cfdata_t, void *);
void bivideoattach(struct device *, struct device *, void *);
int bivideo_ioctl(void *, u_long, void *, int, struct lwp *);
paddr_t bivideo_mmap(void *, off_t, int);
@@ -140,7 +140,7 @@
* function bodies
*/
int
-bivideomatch(struct device *parent, struct cfdata *match, void *aux)
+bivideomatch(struct device *parent, cfdata_t match, void *aux)
{
struct mainbus_attach_args *ma = aux;
Index: src/sys/dev/hpc/btnmgr.c
diff -u src/sys/dev/hpc/btnmgr.c:1.23 src/sys/dev/hpc/btnmgr.c:1.24
--- src/sys/dev/hpc/btnmgr.c:1.23 Sun Apr 5 00:34:42 2009
+++ src/sys/dev/hpc/btnmgr.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btnmgr.c,v 1.23 2009/04/05 00:34:42 uwe Exp $ */
+/* $NetBSD: btnmgr.c,v 1.24 2009/05/12 12:13:49 cegger Exp $ */
/*-
* Copyright (c) 1999
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.23 2009/04/05 00:34:42 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.24 2009/05/12 12:13:49 cegger Exp $");
#ifdef _KERNEL_OPT
#include "opt_btnmgr.h"
@@ -83,7 +83,7 @@
#endif
};
-int btnmgrmatch(struct device *, struct cfdata *, void *);
+int btnmgrmatch(struct device *, cfdata_t, void *);
void btnmgrattach(struct device *, struct device *, void *);
const char *btnmgr_name(long);
static int btnmgr_hook(void *, int, long, void *);
@@ -173,7 +173,7 @@
* function bodies
*/
int
-btnmgrmatch(struct device *parent, struct cfdata *match, void *aux)
+btnmgrmatch(struct device *parent, cfdata_t match, void *aux)
{
struct mainbus_attach_args *ma = aux;
Index: src/sys/dev/hpc/hpf1275a_tty.c
diff -u src/sys/dev/hpc/hpf1275a_tty.c:1.23 src/sys/dev/hpc/hpf1275a_tty.c:1.24
--- src/sys/dev/hpc/hpf1275a_tty.c:1.23 Sun Apr 6 20:28:36 2008
+++ src/sys/dev/hpc/hpf1275a_tty.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpf1275a_tty.c,v 1.23 2008/04/06 20:28:36 cegger Exp $ */
+/* $NetBSD: hpf1275a_tty.c,v 1.24 2009/05/12 12:13:49 cegger Exp $ */
/*
* Copyright (c) 2004 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.23 2008/04/06 20:28:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.24 2009/05/12 12:13:49 cegger Exp $");
#include "opt_wsdisplay_compat.h"
@@ -76,7 +76,7 @@
static int hpf1275a_input(int, struct tty *);
/* autoconf(9) methods */
-static int hpf1275a_match(struct device *, struct cfdata *, void *);
+static int hpf1275a_match(struct device *, cfdata_t, void *);
static void hpf1275a_attach(struct device *, struct device *, void *);
static int hpf1275a_detach(struct device *, int);
@@ -245,7 +245,7 @@
*/
static int
hpf1275a_match(struct device *self,
- struct cfdata *cfdata, void *arg)
+ cfdata_t cfdata, void *arg)
{
/* pseudo-device; always present */
Index: src/sys/dev/hpc/button.c
diff -u src/sys/dev/hpc/button.c:1.13 src/sys/dev/hpc/button.c:1.14
--- src/sys/dev/hpc/button.c:1.13 Fri Oct 19 11:59:42 2007
+++ src/sys/dev/hpc/button.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: button.c,v 1.13 2007/10/19 11:59:42 ad Exp $ */
+/* $NetBSD: button.c,v 1.14 2009/05/12 12:13:49 cegger Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.13 2007/10/19 11:59:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.14 2009/05/12 12:13:49 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@
config_hook_tag sc_ghook_tag;
};
-static int button_match(struct device *, struct cfdata *, void *);
+static int button_match(struct device *, cfdata_t, void *);
static void button_attach(struct device *, struct device *, void *);
static int button_intr(void *);
static int button_state(void *, int, long, void *);
@@ -71,7 +71,7 @@
button_match, button_attach, NULL, NULL);
int
-button_match(struct device *parent, struct cfdata *match, void *aux)
+button_match(struct device *parent, cfdata_t match, void *aux)
{
struct hpcio_attach_args *haa = aux;
platid_mask_t mask;
Index: src/sys/dev/hpc/hpcout.c
diff -u src/sys/dev/hpc/hpcout.c:1.13 src/sys/dev/hpc/hpcout.c:1.14
--- src/sys/dev/hpc/hpcout.c:1.13 Mon Apr 28 20:23:48 2008
+++ src/sys/dev/hpc/hpcout.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcout.c,v 1.13 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: hpcout.c,v 1.14 2009/05/12 12:13:49 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.13 2008/04/28 20:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.14 2009/05/12 12:13:49 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
#include "locators.h"
-int hpcout_match(struct device *, struct cfdata *, void *);
+int hpcout_match(struct device *, cfdata_t, void *);
void hpcout_attach(struct device *, struct device *, void *);
int hpcout_hook(void *, int, long, void *);
@@ -66,7 +66,7 @@
hpcout_match, hpcout_attach, NULL, NULL);
int
-hpcout_match(struct device *parent, struct cfdata *cf, void *aux)
+hpcout_match(struct device *parent, cfdata_t cf, void *aux)
{
return (1);
}
Index: src/sys/dev/hpc/hpcapm.c
diff -u src/sys/dev/hpc/hpcapm.c:1.16 src/sys/dev/hpc/hpcapm.c:1.17
--- src/sys/dev/hpc/hpcapm.c:1.16 Sun Apr 5 02:04:40 2009
+++ src/sys/dev/hpc/hpcapm.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcapm.c,v 1.16 2009/04/05 02:04:40 uwe Exp $ */
+/* $NetBSD: hpcapm.c,v 1.17 2009/05/12 12:13:49 cegger Exp $ */
/*
* Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.16 2009/04/05 02:04:40 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.17 2009/05/12 12:13:49 cegger Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcapm.h"
@@ -61,7 +61,7 @@
#endif
/* Definition of the driver for autoconfig. */
-static int hpcapm_match(struct device *, struct cfdata *, void *);
+static int hpcapm_match(struct device *, cfdata_t, void *);
static void hpcapm_attach(struct device *, struct device *, void *);
static int hpcapm_hook(void *, int, long, void *);
@@ -107,7 +107,7 @@
static int
hpcapm_match(struct device *parent,
- struct cfdata *cf, void *aux)
+ cfdata_t cf, void *aux)
{
return 1;
Index: src/sys/dev/hpc/hpcioman.c
diff -u src/sys/dev/hpc/hpcioman.c:1.16 src/sys/dev/hpc/hpcioman.c:1.17
--- src/sys/dev/hpc/hpcioman.c:1.16 Mon Apr 28 20:23:48 2008
+++ src/sys/dev/hpc/hpcioman.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcioman.c,v 1.16 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: hpcioman.c,v 1.17 2009/05/12 12:13:49 cegger Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.16 2008/04/28 20:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.17 2009/05/12 12:13:49 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,10 +46,10 @@
#include "locators.h"
-int hpcioman_match(struct device *, struct cfdata *, void *);
+int hpcioman_match(struct device *, cfdata_t, void *);
void hpcioman_attach(struct device *, struct device *, void *);
int hpcioman_print(void *, const char *);
-int hpcioman_search(struct device *, struct cfdata *,
+int hpcioman_search(struct device *, cfdata_t,
const int *, void *);
struct hpcioman_softc {
@@ -60,7 +60,7 @@
hpcioman_match, hpcioman_attach, NULL, NULL);
int
-hpcioman_match(struct device *parent, struct cfdata *cf, void *aux)
+hpcioman_match(struct device *parent, cfdata_t cf, void *aux)
{
struct hpcio_attach_args *haa = aux;
platid_mask_t mask;
@@ -82,7 +82,7 @@
}
int
-hpcioman_search(struct device *parent, struct cfdata *cf,
+hpcioman_search(struct device *parent, cfdata_t cf,
const int *ldesc, void *aux)
{
//struct hpcioman_softc *sc = (struct hpcioman_softc *)parent;
Index: src/sys/dev/hpc/hpcin.c
diff -u src/sys/dev/hpc/hpcin.c:1.12 src/sys/dev/hpc/hpcin.c:1.13
--- src/sys/dev/hpc/hpcin.c:1.12 Mon Apr 28 20:23:48 2008
+++ src/sys/dev/hpc/hpcin.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcin.c,v 1.12 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: hpcin.c,v 1.13 2009/05/12 12:13:49 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.12 2008/04/28 20:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.13 2009/05/12 12:13:49 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
#include "locators.h"
-int hpcin_match(struct device *, struct cfdata *, void *);
+int hpcin_match(struct device *, cfdata_t, void *);
void hpcin_attach(struct device *, struct device *, void *);
int hpcin_intr(void *);
@@ -69,7 +69,7 @@
hpcin_match, hpcin_attach, NULL, NULL);
int
-hpcin_match(struct device *parent, struct cfdata *cf, void *aux)
+hpcin_match(struct device *parent, cfdata_t cf, void *aux)
{
return (1);
}
Index: src/sys/dev/hpc/hpckbd.c
diff -u src/sys/dev/hpc/hpckbd.c:1.26 src/sys/dev/hpc/hpckbd.c:1.27
--- src/sys/dev/hpc/hpckbd.c:1.26 Sun Apr 5 02:17:18 2009
+++ src/sys/dev/hpc/hpckbd.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbd.c,v 1.26 2009/04/05 02:17:18 uwe Exp $ */
+/* $NetBSD: hpckbd.c,v 1.27 2009/05/12 12:13:49 cegger Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.26 2009/04/05 02:17:18 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.27 2009/05/12 12:13:49 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@
struct hpckbd_core sc_coredata;
};
-int hpckbd_match(struct device *, struct cfdata *, void *);
+int hpckbd_match(struct device *, cfdata_t, void *);
void hpckbd_attach(struct device *, struct device *, void *);
void hpckbd_initcore(struct hpckbd_core *, struct hpckbd_ic_if *, int);
@@ -140,7 +140,7 @@
int
hpckbd_match(struct device *parent,
- struct cfdata *cf, void *aux)
+ cfdata_t cf, void *aux)
{
return (1);
}
Index: src/sys/dev/hpc/pwctl.c
diff -u src/sys/dev/hpc/pwctl.c:1.17 src/sys/dev/hpc/pwctl.c:1.18
--- src/sys/dev/hpc/pwctl.c:1.17 Fri Oct 19 11:59:43 2007
+++ src/sys/dev/hpc/pwctl.c Tue May 12 12:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pwctl.c,v 1.17 2007/10/19 11:59:43 ad Exp $ */
+/* $NetBSD: pwctl.c,v 1.18 2009/05/12 12:13:49 cegger Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.17 2007/10/19 11:59:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.18 2009/05/12 12:13:49 cegger Exp $");
#ifdef _KERNEL_OPT
#include "opt_pwctl.h"
@@ -82,7 +82,7 @@
int sc_initvalue;
};
-static int pwctl_match(struct device *, struct cfdata *, void *);
+static int pwctl_match(struct device *, cfdata_t, void *);
static void pwctl_attach(struct device *, struct device *, void *);
static int pwctl_hook(void *, int, long, void *);
static int pwctl_ghook(void *, int, long, void *);
@@ -92,7 +92,7 @@
pwctl_match, pwctl_attach, NULL, NULL);
int
-pwctl_match(struct device *parent, struct cfdata *match, void *aux)
+pwctl_match(struct device *parent, cfdata_t match, void *aux)
{
struct hpcio_attach_args *haa = aux;
platid_mask_t mask;
