Module Name: src
Committed By: cegger
Date: Tue May 12 12:15:37 UTC 2009
Modified Files:
src/sys/dev/ic: cpc700.c icpsp.c iic_cpcbus.c timer_cpcbus.c z8530tty.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/cpc700.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/icpsp.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/iic_cpcbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/timer_cpcbus.c
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/ic/z8530tty.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/ic/cpc700.c
diff -u src/sys/dev/ic/cpc700.c:1.14 src/sys/dev/ic/cpc700.c:1.15
--- src/sys/dev/ic/cpc700.c:1.14 Mon Apr 28 20:23:49 2008
+++ src/sys/dev/ic/cpc700.c Tue May 12 12:15:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc700.c,v 1.14 2008/04/28 20:23:49 martin Exp $ */
+/* $NetBSD: cpc700.c,v 1.15 2009/05/12 12:15:37 cegger Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.14 2008/04/28 20:23:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.15 2009/05/12 12:15:37 cegger Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -104,7 +104,7 @@
}
static int
-cpc_submatch(struct device *parent, struct cfdata *cf,
+cpc_submatch(struct device *parent, cfdata_t cf,
const int *ldesc, void *aux)
{
struct cpcbus_attach_args *caa = aux;
Index: src/sys/dev/ic/icpsp.c
diff -u src/sys/dev/ic/icpsp.c:1.21 src/sys/dev/ic/icpsp.c:1.22
--- src/sys/dev/ic/icpsp.c:1.21 Mon Apr 28 20:23:50 2008
+++ src/sys/dev/ic/icpsp.c Tue May 12 12:15:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: icpsp.c,v 1.21 2008/04/28 20:23:50 martin Exp $ */
+/* $NetBSD: icpsp.c,v 1.22 2009/05/12 12:15:37 cegger Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.21 2008/04/28 20:23:50 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.22 2009/05/12 12:15:37 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,7 @@
void icpsp_attach(struct device *, struct device *, void *);
void icpsp_intr(struct icp_ccb *);
-int icpsp_match(struct device *, struct cfdata *, void *);
+int icpsp_match(struct device *, cfdata_t, void *);
void icpsp_scsipi_request(struct scsipi_channel *, scsipi_adapter_req_t,
void *);
@@ -81,7 +81,7 @@
};
int
-icpsp_match(struct device *parent, struct cfdata *match,
+icpsp_match(struct device *parent, cfdata_t match,
void *aux)
{
struct icp_attach_args *icpa;
Index: src/sys/dev/ic/iic_cpcbus.c
diff -u src/sys/dev/ic/iic_cpcbus.c:1.10 src/sys/dev/ic/iic_cpcbus.c:1.11
--- src/sys/dev/ic/iic_cpcbus.c:1.10 Mon Apr 28 20:23:50 2008
+++ src/sys/dev/ic/iic_cpcbus.c Tue May 12 12:15:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: iic_cpcbus.c,v 1.10 2008/04/28 20:23:50 martin Exp $ */
+/* $NetBSD: iic_cpcbus.c,v 1.11 2009/05/12 12:15:37 cegger Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iic_cpcbus.c,v 1.10 2008/04/28 20:23:50 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iic_cpcbus.c,v 1.11 2009/05/12 12:15:37 cegger Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -47,14 +47,14 @@
void *sc_ih;
};
-static int iic_cpcbus_match(struct device *, struct cfdata *, void *);
+static int iic_cpcbus_match(struct device *, cfdata_t, void *);
static void iic_cpcbus_attach(struct device *, struct device *, void *);
CFATTACH_DECL(iic_cpcbus, sizeof(struct iic_cpcbus_softc),
iic_cpcbus_match, iic_cpcbus_attach, NULL, NULL);
int
-iic_cpcbus_match(struct device *parent, struct cfdata *cf, void *aux)
+iic_cpcbus_match(struct device *parent, cfdata_t cf, void *aux)
{
struct cpcbus_attach_args *caa = aux;
Index: src/sys/dev/ic/timer_cpcbus.c
diff -u src/sys/dev/ic/timer_cpcbus.c:1.9 src/sys/dev/ic/timer_cpcbus.c:1.10
--- src/sys/dev/ic/timer_cpcbus.c:1.9 Mon Apr 28 20:23:51 2008
+++ src/sys/dev/ic/timer_cpcbus.c Tue May 12 12:15:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_cpcbus.c,v 1.9 2008/04/28 20:23:51 martin Exp $ */
+/* $NetBSD: timer_cpcbus.c,v 1.10 2009/05/12 12:15:37 cegger Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_cpcbus.c,v 1.9 2008/04/28 20:23:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_cpcbus.c,v 1.10 2009/05/12 12:15:37 cegger Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -44,14 +44,14 @@
void *sc_ih;
};
-static int cpctim_match(struct device *, struct cfdata *, void *);
+static int cpctim_match(struct device *, cfdata_t, void *);
static void cpctim_attach(struct device *, struct device *, void *);
CFATTACH_DECL(cpctim, sizeof(struct cpctim_softc),
cpctim_match, cpctim_attach, NULL, NULL);
int
-cpctim_match(struct device *parent, struct cfdata *cf, void *aux)
+cpctim_match(struct device *parent, cfdata_t cf, void *aux)
{
struct cpcbus_attach_args *caa = aux;
Index: src/sys/dev/ic/z8530tty.c
diff -u src/sys/dev/ic/z8530tty.c:1.124 src/sys/dev/ic/z8530tty.c:1.125
--- src/sys/dev/ic/z8530tty.c:1.124 Fri Mar 20 16:28:57 2009
+++ src/sys/dev/ic/z8530tty.c Tue May 12 12:15:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530tty.c,v 1.124 2009/03/20 16:28:57 tsutsui Exp $ */
+/* $NetBSD: z8530tty.c,v 1.125 2009/05/12 12:15:37 cegger Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -137,7 +137,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.124 2009/03/20 16:28:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.125 2009/05/12 12:15:37 cegger Exp $");
#include "opt_kgdb.h"
#include "opt_ntp.h"
@@ -318,7 +318,7 @@
{
struct zstty_softc *zst = device_private(self);
struct zsc_softc *zsc = device_private(parent);
- struct cfdata *cf = device_cfdata(self);
+ cfdata_t cf = device_cfdata(self);
struct zsc_attach_args *args = aux;
struct zs_chanstate *cs;
struct tty *tp;
