Module Name: src
Committed By: cegger
Date: Tue May 12 14:29:42 UTC 2009
Modified Files:
src/sys/dev/ir: cir.c irframe_tty.c irframevar.h
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ir/cir.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ir/irframe_tty.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ir/irframevar.h
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/ir/cir.c
diff -u src/sys/dev/ir/cir.c:1.24 src/sys/dev/ir/cir.c:1.25
--- src/sys/dev/ir/cir.c:1.24 Tue May 12 12:18:09 2009
+++ src/sys/dev/ir/cir.c Tue May 12 14:29:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cir.c,v 1.24 2009/05/12 12:18:09 cegger Exp $ */
+/* $NetBSD: cir.c,v 1.25 2009/05/12 14:29:42 cegger Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.24 2009/05/12 12:18:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.25 2009/05/12 14:29:42 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,10 +59,10 @@
D_OTHER
};
-int cir_match(struct device *parent, cfdata_t match, void *aux);
-void cir_attach(struct device *parent, struct device *self, void *aux);
-int cir_activate(struct device *self, enum devact act);
-int cir_detach(struct device *self, int flags);
+int cir_match(device_t parent, cfdata_t match, void *aux);
+void cir_attach(device_t parent, device_t self, void *aux);
+int cir_activate(device_t self, enum devact act);
+int cir_detach(device_t self, int flags);
CFATTACH_DECL(cir, sizeof(struct cir_softc),
cir_match, cir_attach, cir_detach, cir_activate);
@@ -72,7 +72,7 @@
#define CIRUNIT(dev) (minor(dev))
int
-cir_match(struct device *parent, cfdata_t match, void *aux)
+cir_match(device_t parent, cfdata_t match, void *aux)
{
struct ir_attach_args *ia = aux;
@@ -80,7 +80,7 @@
}
void
-cir_attach(struct device *parent, struct device *self, void *aux)
+cir_attach(device_t parent, device_t self, void *aux)
{
struct cir_softc *sc = device_private(self);
struct ir_attach_args *ia = aux;
@@ -99,7 +99,7 @@
}
int
-cir_activate(struct device *self, enum devact act)
+cir_activate(device_t self, enum devact act)
{
/*struct cir_softc *sc = device_private(self);*/
@@ -115,7 +115,7 @@
}
int
-cir_detach(struct device *self, int flags)
+cir_detach(device_t self, int flags)
{
struct cir_softc *sc = device_private(self);
int maj, mn;
Index: src/sys/dev/ir/irframe_tty.c
diff -u src/sys/dev/ir/irframe_tty.c:1.57 src/sys/dev/ir/irframe_tty.c:1.58
--- src/sys/dev/ir/irframe_tty.c:1.57 Tue May 12 12:18:09 2009
+++ src/sys/dev/ir/irframe_tty.c Tue May 12 14:29:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.57 2009/05/12 12:18:09 cegger Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.58 2009/05/12 14:29:42 cegger Exp $ */
/*
* TODO
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.57 2009/05/12 12:18:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.58 2009/05/12 14:29:42 cegger Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -196,8 +196,8 @@
};
/* glue to attach irframe device */
-static void irframet_attach(struct device *, struct device *, void *);
-static int irframet_detach(struct device *, int);
+static void irframet_attach(device_t, device_t, void *);
+static int irframet_detach(device_t, int);
CFATTACH_DECL_NEW(irframet, sizeof(struct irframet_softc),
NULL, irframet_attach, irframet_detach, NULL);
@@ -240,7 +240,7 @@
}
static int
-irframet_detach(struct device *dev, int flags)
+irframet_detach(device_t dev, int flags)
{
struct irframet_softc *sc = device_private(dev);
int rc;
Index: src/sys/dev/ir/irframevar.h
diff -u src/sys/dev/ir/irframevar.h:1.18 src/sys/dev/ir/irframevar.h:1.19
--- src/sys/dev/ir/irframevar.h:1.18 Mon Apr 28 20:23:51 2008
+++ src/sys/dev/ir/irframevar.h Tue May 12 14:29:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: irframevar.h,v 1.18 2008/04/28 20:23:51 martin Exp $ */
+/* $NetBSD: irframevar.h,v 1.19 2009/05/12 14:29:42 cegger Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -58,5 +58,5 @@
#define IRDA_MAX_FRAME_SIZE 2048
#define IRDA_MAX_EBOFS 64
-void irframe_attach(struct device *, struct device *, void *);
-int irframe_detach(struct device *, int);
+void irframe_attach(device_t, device_t, void *);
+int irframe_detach(device_t, int);
