Module Name: src
Committed By: cegger
Date: Tue May 12 14:21:58 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 device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/gpib/cs80bus.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/gpib/ct.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/gpib/gpib.c src/sys/dev/gpib/ppi.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/gpib/hil_gpib.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/gpib/mt.c
cvs rdiff -u -r1.25 -r1.26 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.13 src/sys/dev/gpib/cs80bus.c:1.14
--- src/sys/dev/gpib/cs80bus.c:1.13 Tue May 12 12:13:21 2009
+++ src/sys/dev/gpib/cs80bus.c Tue May 12 14:21:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cs80bus.c,v 1.13 2009/05/12 12:13:21 cegger Exp $ */
+/* $NetBSD: cs80bus.c,v 1.14 2009/05/12 14:21:58 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.13 2009/05/12 12:13:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.14 2009/05/12 14:21:58 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 *, cfdata_t, void *);
-void cs80busattach(struct device *, struct device *, void *);
+int cs80busmatch(device_t, cfdata_t, void *);
+void cs80busattach(device_t, device_t, 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 *, cfdata_t,
+static int cs80bussearch(device_t, cfdata_t,
const int *, void *);
static int cs80busprint(void *, const char *);
@@ -91,14 +91,14 @@
*/
int
-cs80busmatch(struct device *parent, cfdata_t match, void *aux)
+cs80busmatch(device_t parent, cfdata_t match, void *aux)
{
return (1);
}
void
-cs80busattach(struct device *parent, struct device *self, void *aux)
+cs80busattach(device_t parent, device_t self, void *aux)
{
struct cs80bus_softc *sc = device_private(self);
struct gpib_attach_args *ga = aux;
@@ -135,7 +135,7 @@
}
int
-cs80bussearch(struct device *parent, cfdata_t cf, const int *ldesc, void *aux)
+cs80bussearch(device_t 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.20 src/sys/dev/gpib/ct.c:1.21
--- src/sys/dev/gpib/ct.c:1.20 Tue May 12 12:13:21 2009
+++ src/sys/dev/gpib/ct.c Tue May 12 14:21:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ct.c,v 1.20 2009/05/12 12:13:21 cegger Exp $ */
+/* $NetBSD: ct.c,v 1.21 2009/05/12 14:21:58 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.20 2009/05/12 12:13:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.21 2009/05/12 14:21:58 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,13 +191,13 @@
int sc_eofs[EOFS];
};
-int ctmatch(struct device *, cfdata_t, void *);
-void ctattach(struct device *, struct device *, void *);
+int ctmatch(device_t, cfdata_t, void *);
+void ctattach(device_t, device_t, void *);
CFATTACH_DECL(ct, sizeof(struct ct_softc),
ctmatch, ctattach, NULL, NULL);
-int ctident(struct device *, struct ct_softc *,
+int ctident(device_t, struct ct_softc *,
struct cs80bus_attach_args *);
int ctlookup(int, int, int);
@@ -262,7 +262,7 @@
}
int
-ctmatch(struct device *parent, cfdata_t match, void *aux)
+ctmatch(device_t parent, cfdata_t match, void *aux)
{
struct cs80bus_attach_args *ca = aux;
int i;
@@ -274,7 +274,7 @@
}
void
-ctattach(struct device *parent, struct device *self, void *aux)
+ctattach(device_t parent, device_t self, void *aux)
{
struct ct_softc *sc = device_private(self);
struct cs80bus_attach_args *ca = aux;
Index: src/sys/dev/gpib/gpib.c
diff -u src/sys/dev/gpib/gpib.c:1.16 src/sys/dev/gpib/gpib.c:1.17
--- src/sys/dev/gpib/gpib.c:1.16 Tue May 12 12:13:21 2009
+++ src/sys/dev/gpib/gpib.c Tue May 12 14:21:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpib.c,v 1.16 2009/05/12 12:13:21 cegger Exp $ */
+/* $NetBSD: gpib.c,v 1.17 2009/05/12 14:21:58 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.16 2009/05/12 12:13:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.17 2009/05/12 14:21:58 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,15 +58,15 @@
#define DPRINTF(mask, str) /* nothing */
#endif
-int gpibmatch(struct device *, cfdata_t, void *);
-void gpibattach(struct device *, struct device *, void *);
+int gpibmatch(device_t, cfdata_t, void *);
+void gpibattach(device_t, device_t, void *);
CFATTACH_DECL(gpib, sizeof(struct gpib_softc),
gpibmatch, gpibattach, NULL, NULL);
-static int gpibsubmatch1(struct device *, cfdata_t,
+static int gpibsubmatch1(device_t, cfdata_t,
const int *, void *);
-static int gpibsubmatch2(struct device *, cfdata_t,
+static int gpibsubmatch2(device_t, cfdata_t,
const int *, void *);
static int gpibprint(void *, const char *);
@@ -89,14 +89,14 @@
int gpibtimeout = 100000; /* # of status tests before we give up */
int
-gpibmatch(struct device *parent, cfdata_t match, void *aux)
+gpibmatch(device_t parent, cfdata_t match, void *aux)
{
return (1);
}
void
-gpibattach(struct device *parent, struct device *self, void *aux)
+gpibattach(device_t parent, device_t self, void *aux)
{
struct gpib_softc *sc = device_private(self);
cfdata_t cf = device_cfdata(&sc->sc_dev);
@@ -138,7 +138,7 @@
}
int
-gpibsubmatch1(struct device *parent, cfdata_t cf, const int *ldesc, void *aux)
+gpibsubmatch1(device_t 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, cfdata_t cf, const int *ldesc, void *aux)
+gpibsubmatch2(device_t 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.16 src/sys/dev/gpib/ppi.c:1.17
--- src/sys/dev/gpib/ppi.c:1.16 Tue May 12 12:13:21 2009
+++ src/sys/dev/gpib/ppi.c Tue May 12 14:21:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ppi.c,v 1.16 2009/05/12 12:13:21 cegger Exp $ */
+/* $NetBSD: ppi.c,v 1.17 2009/05/12 14:21:58 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.16 2009/05/12 12:13:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.17 2009/05/12 14:21:58 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,8 +103,8 @@
#define PPIF_TIMO 0x08
#define PPIF_DELAY 0x10
-int ppimatch(struct device *, cfdata_t, void *);
-void ppiattach(struct device *, struct device *, void *);
+int ppimatch(device_t, cfdata_t, void *);
+void ppiattach(device_t, device_t, void *);
CFATTACH_DECL(ppi, sizeof(struct ppi_softc),
ppimatch, ppiattach, NULL, NULL);
@@ -143,14 +143,14 @@
#endif
int
-ppimatch(struct device *parent, cfdata_t match, void *aux)
+ppimatch(device_t parent, cfdata_t match, void *aux)
{
return (1);
}
void
-ppiattach(struct device *parent, struct device *self, void *aux)
+ppiattach(device_t parent, device_t self, void *aux)
{
struct ppi_softc *sc = device_private(self);
struct gpib_attach_args *ga = aux;
Index: src/sys/dev/gpib/hil_gpib.c
diff -u src/sys/dev/gpib/hil_gpib.c:1.10 src/sys/dev/gpib/hil_gpib.c:1.11
--- src/sys/dev/gpib/hil_gpib.c:1.10 Tue May 12 12:13:21 2009
+++ src/sys/dev/gpib/hil_gpib.c Tue May 12 14:21:58 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: hil_gpib.c,v 1.10 2009/05/12 12:13:21 cegger Exp $ */
+/* $NetBSD: hil_gpib.c,v 1.11 2009/05/12 14:21:58 cegger Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hil_gpib.c,v 1.10 2009/05/12 12:13:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hil_gpib.c,v 1.11 2009/05/12 14:21:58 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,8 +39,8 @@
#define HILF_DELAY 0x10
};
-int hilmatch(struct device *, cfdata_t, void *);
-void hilattach(struct device *, struct device *, void *);
+int hilmatch(device_t, cfdata_t, void *);
+void hilattach(device_t, device_t, void *);
const struct cfattach hil_ca = {
sizeof(struct hil_softc), hilmatch, hilattach,
@@ -50,7 +50,7 @@
void hilstart(void *);
int
-hilmatch(struct device *parent, cfdata_t match, void *aux)
+hilmatch(device_t parent, cfdata_t match, void *aux)
{
struct gpib_attach_args *ga = aux;
u_int8_t *cmd = "SE;";
@@ -65,7 +65,7 @@
}
void
-hilattach(struct device *parent, struct device *self, void *aux)
+hilattach(device_t parent, device_t self, void *aux)
{
struct hil_softc *sc = device_private(self);
struct gpib_attach_args *ga = aux;
Index: src/sys/dev/gpib/mt.c
diff -u src/sys/dev/gpib/mt.c:1.19 src/sys/dev/gpib/mt.c:1.20
--- src/sys/dev/gpib/mt.c:1.19 Tue May 12 12:13:21 2009
+++ src/sys/dev/gpib/mt.c Tue May 12 14:21:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.19 2009/05/12 12:13:21 cegger Exp $ */
+/* $NetBSD: mt.c,v 1.20 2009/05/12 14:21:58 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.19 2009/05/12 12:13:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.20 2009/05/12 14:21:58 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,8 +174,8 @@
#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 *, cfdata_t, void *);
-void mtattach(struct device *, struct device *, void *);
+int mtmatch(device_t, cfdata_t, void *);
+void mtattach(device_t, device_t, void *);
CFATTACH_DECL(mt, sizeof(struct mt_softc),
mtmatch, mtattach, NULL, NULL);
@@ -237,7 +237,7 @@
}
int
-mtmatch(struct device *parent, cfdata_t match, void *aux)
+mtmatch(device_t parent, cfdata_t match, void *aux)
{
struct cs80bus_attach_args *ca = aux;
@@ -246,7 +246,7 @@
}
void
-mtattach(struct device *parent, struct device *self, void *aux)
+mtattach(device_t parent, device_t self, void *aux)
{
struct mt_softc *sc = device_private(self);
struct cs80bus_attach_args *ca = aux;
Index: src/sys/dev/gpib/rd.c
diff -u src/sys/dev/gpib/rd.c:1.25 src/sys/dev/gpib/rd.c:1.26
--- src/sys/dev/gpib/rd.c:1.25 Tue May 12 12:13:21 2009
+++ src/sys/dev/gpib/rd.c Tue May 12 14:21:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.25 2009/05/12 12:13:21 cegger Exp $ */
+/* $NetBSD: rd.c,v 1.26 2009/05/12 14:21:58 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.25 2009/05/12 12:13:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.26 2009/05/12 14:21:58 cegger Exp $");
#include "rnd.h"
@@ -283,8 +283,8 @@
void rdintr(struct rd_softc *);
int rderror(struct rd_softc *);
-int rdmatch(struct device *, cfdata_t, void *);
-void rdattach(struct device *, struct device *, void *);
+int rdmatch(device_t, cfdata_t, void *);
+void rdattach(device_t, device_t, void *);
CFATTACH_DECL(rd, sizeof(struct rd_softc),
rdmatch, rdattach, NULL, NULL);
@@ -325,7 +325,7 @@
}
int
-rdmatch(struct device *parent, cfdata_t match, void *aux)
+rdmatch(device_t parent, cfdata_t match, void *aux)
{
struct cs80bus_attach_args *ca = aux;
@@ -335,7 +335,7 @@
}
void
-rdattach(struct device *parent, struct device *self, void *aux)
+rdattach(device_t parent, device_t self, void *aux)
{
struct rd_softc *sc = device_private(self);
struct cs80bus_attach_args *ca = aux;
