Module Name: src Committed By: cegger Date: Tue May 12 14:38:56 UTC 2009
Modified Files: src/sys/dev/ofisa: ess_ofisa.c if_cs_ofisa.c ofisa.c Log Message: struct device * -> device_t, no functional changes intended. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ofisa/ess_ofisa.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ofisa/if_cs_ofisa.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ofisa/ofisa.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/ofisa/ess_ofisa.c diff -u src/sys/dev/ofisa/ess_ofisa.c:1.23 src/sys/dev/ofisa/ess_ofisa.c:1.24 --- src/sys/dev/ofisa/ess_ofisa.c:1.23 Tue May 12 13:17:15 2009 +++ src/sys/dev/ofisa/ess_ofisa.c Tue May 12 14:38:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ess_ofisa.c,v 1.23 2009/05/12 13:17:15 cegger Exp $ */ +/* $NetBSD: ess_ofisa.c,v 1.24 2009/05/12 14:38:56 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.23 2009/05/12 13:17:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.24 2009/05/12 14:38:56 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,14 +51,14 @@ #include <dev/isa/essreg.h> #include <dev/isa/essvar.h> -int ess_ofisa_match(struct device *, cfdata_t, void *); -void ess_ofisa_attach(struct device *, struct device *, void *); +int ess_ofisa_match(device_t, cfdata_t, void *); +void ess_ofisa_attach(device_t, device_t, void *); CFATTACH_DECL(ess_ofisa, sizeof(struct ess_softc), ess_ofisa_match, ess_ofisa_attach, NULL, NULL); int -ess_ofisa_match(struct device *parent, cfdata_t cf, void *aux) +ess_ofisa_match(device_t parent, cfdata_t cf, void *aux) { struct ofisa_attach_args *aa = aux; static const char *const compatible_strings[] = { @@ -78,7 +78,7 @@ } void -ess_ofisa_attach(struct device *parent, struct device *self, void *aux) +ess_ofisa_attach(device_t parent, device_t self, void *aux) { struct ess_softc *sc = device_private(self); struct ofisa_attach_args *aa = aux; Index: src/sys/dev/ofisa/if_cs_ofisa.c diff -u src/sys/dev/ofisa/if_cs_ofisa.c:1.21 src/sys/dev/ofisa/if_cs_ofisa.c:1.22 --- src/sys/dev/ofisa/if_cs_ofisa.c:1.21 Tue May 12 13:17:15 2009 +++ src/sys/dev/ofisa/if_cs_ofisa.c Tue May 12 14:38:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_ofisa.c,v 1.21 2009/05/12 13:17:15 cegger Exp $ */ +/* $NetBSD: if_cs_ofisa.c,v 1.22 2009/05/12 14:38:56 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.21 2009/05/12 13:17:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.22 2009/05/12 14:38:56 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,14 +63,14 @@ #include <dev/ic/cs89x0var.h> #include <dev/isa/cs89x0isavar.h> -int cs_ofisa_match(struct device *, cfdata_t, void *); -void cs_ofisa_attach(struct device *, struct device *, void *); +int cs_ofisa_match(device_t, cfdata_t, void *); +void cs_ofisa_attach(device_t, device_t, void *); CFATTACH_DECL(cs_ofisa, sizeof(struct cs_softc_isa), cs_ofisa_match, cs_ofisa_attach, NULL, NULL); int -cs_ofisa_match(struct device *parent, cfdata_t cf, void *aux) +cs_ofisa_match(device_t parent, cfdata_t cf, void *aux) { struct ofisa_attach_args *aa = aux; static const char *const compatible_strings[] = { @@ -91,7 +91,7 @@ } void -cs_ofisa_attach(struct device *parent, struct device *self, void *aux) +cs_ofisa_attach(device_t parent, device_t self, void *aux) { struct cs_softc *sc = device_private(self); struct cs_softc_isa *isc = (void *)sc; Index: src/sys/dev/ofisa/ofisa.c diff -u src/sys/dev/ofisa/ofisa.c:1.22 src/sys/dev/ofisa/ofisa.c:1.23 --- src/sys/dev/ofisa/ofisa.c:1.22 Tue May 12 13:17:15 2009 +++ src/sys/dev/ofisa/ofisa.c Tue May 12 14:38:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ofisa.c,v 1.22 2009/05/12 13:17:15 cegger Exp $ */ +/* $NetBSD: ofisa.c,v 1.23 2009/05/12 14:38:56 cegger Exp $ */ /* * Copyright 1997, 1998 @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.22 2009/05/12 13:17:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.23 2009/05/12 14:38:56 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,8 +51,8 @@ #define OFW_MAX_STACK_BUF_SIZE 256 -static int ofisamatch(struct device *, cfdata_t, void *); -static void ofisaattach(struct device *, struct device *, void *); +static int ofisamatch(device_t, cfdata_t, void *); +static void ofisaattach(device_t, device_t, void *); CFATTACH_DECL(ofisa, sizeof(struct device), ofisamatch, ofisaattach, NULL, NULL); @@ -76,7 +76,7 @@ } int -ofisamatch(struct device *parent, cfdata_t cf, void *aux) +ofisamatch(device_t parent, cfdata_t cf, void *aux) { struct ofbus_attach_args *oba = aux; static const char *const compatible_strings[] = { "pnpPNP,a00", NULL }; @@ -94,7 +94,7 @@ } void -ofisaattach(struct device *parent, struct device *self, void *aux) +ofisaattach(device_t parent, device_t self, void *aux) { struct ofbus_attach_args *oba = aux; struct isabus_attach_args iba;