Module Name: src
Committed By: cegger
Date: Tue May 5 12:07:15 UTC 2009
Modified Files:
src/sys/dev/isa: ess_isa.c
Log Message:
struct device * -> device_t, use device_private()
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/isa/ess_isa.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/isa/ess_isa.c
diff -u src/sys/dev/isa/ess_isa.c:1.21 src/sys/dev/isa/ess_isa.c:1.22
--- src/sys/dev/isa/ess_isa.c:1.21 Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isa/ess_isa.c Tue May 5 12:07:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_isa.c,v 1.21 2008/04/28 20:23:52 martin Exp $ */
+/* $NetBSD: ess_isa.c,v 1.22 2009/05/05 12:07:15 cegger Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.21 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.22 2009/05/05 12:07:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,15 +52,14 @@
#define DPRINTF(x) {}
#endif
-int ess_isa_probe(struct device *, struct cfdata *, void *);
-void ess_isa_attach(struct device *, struct device *, void *);
+int ess_isa_probe(device_t, cfdata_t, void *);
+void ess_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(ess_isa, sizeof(struct ess_softc),
ess_isa_probe, ess_isa_attach, NULL, NULL);
int
-ess_isa_probe(struct device *parent, struct cfdata *match,
- void *aux)
+ess_isa_probe(device_t parent, cfdata_t match, void *aux)
{
int ret;
struct isa_attach_args *ia;
@@ -121,13 +120,13 @@
}
void
-ess_isa_attach(struct device *parent, struct device *self, void *aux)
+ess_isa_attach(device_t parent, device_t self, void *aux)
{
struct ess_softc *sc;
struct isa_attach_args *ia;
int enablejoy;
- sc = (void *)self;
+ sc = device_private(self);
ia = aux;
enablejoy = 0;
printf("\n");
