Module Name: src Committed By: cegger Date: Tue May 12 12:13:21 UTC 2009
Modified Files: src/sys/dev/gpib: cs80bus.c ct.c gpib.c hil_gpib.c mt.c ppi.c rd.c Log Message: struct cfdata * -> cfdata_t, no functional changes intended. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/gpib/cs80bus.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/gpib/ct.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/gpib/gpib.c src/sys/dev/gpib/ppi.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/gpib/hil_gpib.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/gpib/mt.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/gpib/rd.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/gpib/cs80bus.c diff -u src/sys/dev/gpib/cs80bus.c:1.12 src/sys/dev/gpib/cs80bus.c:1.13 --- src/sys/dev/gpib/cs80bus.c:1.12 Sat Mar 14 21:04:19 2009 +++ src/sys/dev/gpib/cs80bus.c Tue May 12 12:13:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cs80bus.c,v 1.12 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: cs80bus.c,v 1.13 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.12 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.13 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,14 +57,14 @@ #define cs80buscf_slave cf_loc[CS80BUSCF_SLAVE] #define cs80buscf_punit cf_loc[CS80BUSCF_PUNIT] -int cs80busmatch(struct device *, struct cfdata *, void *); +int cs80busmatch(struct device *, cfdata_t, void *); void cs80busattach(struct device *, struct device *, void *); CFATTACH_DECL(cs80bus, sizeof(struct cs80bus_softc), cs80busmatch, cs80busattach, NULL, NULL); static int cs80bus_alloc(struct cs80bus_softc *, int, int); -static int cs80bussearch(struct device *, struct cfdata *, +static int cs80bussearch(struct device *, cfdata_t, const int *, void *); static int cs80busprint(void *, const char *); @@ -91,7 +91,7 @@ */ int -cs80busmatch(struct device *parent, struct cfdata *match, void *aux) +cs80busmatch(struct device *parent, cfdata_t match, void *aux) { return (1); @@ -135,7 +135,7 @@ } int -cs80bussearch(struct device *parent, struct cfdata *cf, const int *ldesc, void *aux) +cs80bussearch(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct cs80bus_softc *sc = (struct cs80bus_softc *)parent; struct cs80bus_attach_args *ca = aux; Index: src/sys/dev/gpib/ct.c diff -u src/sys/dev/gpib/ct.c:1.19 src/sys/dev/gpib/ct.c:1.20 --- src/sys/dev/gpib/ct.c:1.19 Sat Mar 14 21:04:19 2009 +++ src/sys/dev/gpib/ct.c Tue May 12 12:13:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ct.c,v 1.19 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: ct.c,v 1.20 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -121,7 +121,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.19 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.20 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -191,7 +191,7 @@ int sc_eofs[EOFS]; }; -int ctmatch(struct device *, struct cfdata *, void *); +int ctmatch(struct device *, cfdata_t, void *); void ctattach(struct device *, struct device *, void *); CFATTACH_DECL(ct, sizeof(struct ct_softc), @@ -262,7 +262,7 @@ } int -ctmatch(struct device *parent, struct cfdata *match, void *aux) +ctmatch(struct device *parent, cfdata_t match, void *aux) { struct cs80bus_attach_args *ca = aux; int i; Index: src/sys/dev/gpib/gpib.c diff -u src/sys/dev/gpib/gpib.c:1.15 src/sys/dev/gpib/gpib.c:1.16 --- src/sys/dev/gpib/gpib.c:1.15 Sat Mar 14 21:04:19 2009 +++ src/sys/dev/gpib/gpib.c Tue May 12 12:13:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: gpib.c,v 1.15 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: gpib.c,v 1.16 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.15 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.16 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,15 +58,15 @@ #define DPRINTF(mask, str) /* nothing */ #endif -int gpibmatch(struct device *, struct cfdata *, void *); +int gpibmatch(struct device *, cfdata_t, void *); void gpibattach(struct device *, struct device *, void *); CFATTACH_DECL(gpib, sizeof(struct gpib_softc), gpibmatch, gpibattach, NULL, NULL); -static int gpibsubmatch1(struct device *, struct cfdata *, +static int gpibsubmatch1(struct device *, cfdata_t, const int *, void *); -static int gpibsubmatch2(struct device *, struct cfdata *, +static int gpibsubmatch2(struct device *, cfdata_t, const int *, void *); static int gpibprint(void *, const char *); @@ -89,7 +89,7 @@ int gpibtimeout = 100000; /* # of status tests before we give up */ int -gpibmatch(struct device *parent, struct cfdata *match, void *aux) +gpibmatch(struct device *parent, cfdata_t match, void *aux) { return (1); @@ -99,7 +99,7 @@ gpibattach(struct device *parent, struct device *self, void *aux) { struct gpib_softc *sc = device_private(self); - struct cfdata *cf = device_cfdata(&sc->sc_dev); + cfdata_t cf = device_cfdata(&sc->sc_dev); struct gpibdev_attach_args *gda = aux; struct gpib_attach_args ga; int address; @@ -138,7 +138,7 @@ } int -gpibsubmatch1(struct device *parent, struct cfdata *cf, const int *ldesc, void *aux) +gpibsubmatch1(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct gpib_softc *sc = (struct gpib_softc *)parent; struct gpib_attach_args *ga = aux; @@ -159,7 +159,7 @@ } int -gpibsubmatch2(struct device *parent, struct cfdata *cf, const int *ldesc, void *aux) +gpibsubmatch2(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct gpib_attach_args *ga = aux; Index: src/sys/dev/gpib/ppi.c diff -u src/sys/dev/gpib/ppi.c:1.15 src/sys/dev/gpib/ppi.c:1.16 --- src/sys/dev/gpib/ppi.c:1.15 Sat Mar 14 21:04:19 2009 +++ src/sys/dev/gpib/ppi.c Tue May 12 12:13:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ppi.c,v 1.15 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: ppi.c,v 1.16 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.15 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.16 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -103,7 +103,7 @@ #define PPIF_TIMO 0x08 #define PPIF_DELAY 0x10 -int ppimatch(struct device *, struct cfdata *, void *); +int ppimatch(struct device *, cfdata_t, void *); void ppiattach(struct device *, struct device *, void *); CFATTACH_DECL(ppi, sizeof(struct ppi_softc), @@ -143,7 +143,7 @@ #endif int -ppimatch(struct device *parent, struct cfdata *match, void *aux) +ppimatch(struct device *parent, cfdata_t match, void *aux) { return (1); Index: src/sys/dev/gpib/hil_gpib.c diff -u src/sys/dev/gpib/hil_gpib.c:1.9 src/sys/dev/gpib/hil_gpib.c:1.10 --- src/sys/dev/gpib/hil_gpib.c:1.9 Sat Mar 14 21:04:19 2009 +++ src/sys/dev/gpib/hil_gpib.c Tue May 12 12:13:21 2009 @@ -1,7 +1,7 @@ -/* $NetBSD: hil_gpib.c,v 1.9 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: hil_gpib.c,v 1.10 2009/05/12 12:13:21 cegger Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hil_gpib.c,v 1.9 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hil_gpib.c,v 1.10 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,7 @@ #define HILF_DELAY 0x10 }; -int hilmatch(struct device *, struct cfdata *, void *); +int hilmatch(struct device *, cfdata_t, void *); void hilattach(struct device *, struct device *, void *); const struct cfattach hil_ca = { @@ -50,7 +50,7 @@ void hilstart(void *); int -hilmatch(struct device *parent, struct cfdata *match, void *aux) +hilmatch(struct device *parent, cfdata_t match, void *aux) { struct gpib_attach_args *ga = aux; u_int8_t *cmd = "SE;"; Index: src/sys/dev/gpib/mt.c diff -u src/sys/dev/gpib/mt.c:1.18 src/sys/dev/gpib/mt.c:1.19 --- src/sys/dev/gpib/mt.c:1.18 Sat Mar 14 21:04:19 2009 +++ src/sys/dev/gpib/mt.c Tue May 12 12:13:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mt.c,v 1.18 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: mt.c,v 1.19 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -114,7 +114,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.18 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.19 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -174,7 +174,7 @@ #define B_CMD B_DEVPRIVATE /* command buf instead of data */ #define b_cmd b_blkno /* blkno holds cmd when B_CMD */ -int mtmatch(struct device *, struct cfdata *, void *); +int mtmatch(struct device *, cfdata_t, void *); void mtattach(struct device *, struct device *, void *); CFATTACH_DECL(mt, sizeof(struct mt_softc), @@ -237,7 +237,7 @@ } int -mtmatch(struct device *parent, struct cfdata *match, void *aux) +mtmatch(struct device *parent, cfdata_t match, void *aux) { struct cs80bus_attach_args *ca = aux; Index: src/sys/dev/gpib/rd.c diff -u src/sys/dev/gpib/rd.c:1.24 src/sys/dev/gpib/rd.c:1.25 --- src/sys/dev/gpib/rd.c:1.24 Sat Mar 14 21:04:19 2009 +++ src/sys/dev/gpib/rd.c Tue May 12 12:13:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.24 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: rd.c,v 1.25 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.24 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.25 2009/05/12 12:13:21 cegger Exp $"); #include "rnd.h" @@ -283,7 +283,7 @@ void rdintr(struct rd_softc *); int rderror(struct rd_softc *); -int rdmatch(struct device *, struct cfdata *, void *); +int rdmatch(struct device *, cfdata_t, void *); void rdattach(struct device *, struct device *, void *); CFATTACH_DECL(rd, sizeof(struct rd_softc), @@ -325,7 +325,7 @@ } int -rdmatch(struct device *parent, struct cfdata *match, void *aux) +rdmatch(struct device *parent, cfdata_t match, void *aux) { struct cs80bus_attach_args *ca = aux;