Module Name: src Committed By: cegger Date: Mon May 4 12:14:31 UTC 2009
Modified Files: src/sys/arch/i386/isa: ahc_isa.c lms.c mms.c Log Message: struct device * -> device_t No functional changes intended. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/i386/isa/ahc_isa.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/i386/isa/lms.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/isa/mms.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/arch/i386/isa/ahc_isa.c diff -u src/sys/arch/i386/isa/ahc_isa.c:1.35 src/sys/arch/i386/isa/ahc_isa.c:1.36 --- src/sys/arch/i386/isa/ahc_isa.c:1.35 Mon Apr 28 20:23:24 2008 +++ src/sys/arch/i386/isa/ahc_isa.c Mon May 4 12:14:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ahc_isa.c,v 1.35 2008/04/28 20:23:24 martin Exp $ */ +/* $NetBSD: ahc_isa.c,v 1.36 2009/05/04 12:14:31 cegger Exp $ */ /* * Product specific probe and attach routines for: @@ -110,7 +110,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.35 2008/04/28 20:23:24 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.36 2009/05/04 12:14:31 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -162,8 +162,8 @@ int ahc_isa_idstring(bus_space_tag_t, bus_space_handle_t, char *); int ahc_isa_match(struct isa_attach_args *, bus_addr_t); -int ahc_isa_probe(struct device *, struct cfdata *, void *); -void ahc_isa_attach(struct device *, struct device *, void *); +int ahc_isa_probe(device_t, cfdata_t, void *); +void ahc_isa_attach(device_t, device_t, void *); void aha2840_load_seeprom(struct ahc_softc *ahc); static int verify_seeprom_cksum(struct seeprom_config *sc); @@ -303,7 +303,7 @@ * the actual probe routine to check it out. */ int -ahc_isa_probe(struct device *parent, struct cfdata *match, void *aux) +ahc_isa_probe(device_t parent, cfdata_t match, void *aux) { struct isa_attach_args *ia = aux; struct ahc_isa_slot *as; @@ -360,9 +360,9 @@ } void -ahc_isa_attach(struct device *parent, struct device *self, void *aux) +ahc_isa_attach(device_t parent, device_t self, void *aux) { - struct ahc_softc *ahc = (void *)self; + struct ahc_softc *ahc = device_private(self); struct isa_attach_args *ia = aux; bus_space_tag_t iot = ia->ia_iot; bus_space_handle_t ioh; Index: src/sys/arch/i386/isa/lms.c diff -u src/sys/arch/i386/isa/lms.c:1.54 src/sys/arch/i386/isa/lms.c:1.55 --- src/sys/arch/i386/isa/lms.c:1.54 Wed Jul 9 20:50:41 2008 +++ src/sys/arch/i386/isa/lms.c Mon May 4 12:14:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: lms.c,v 1.54 2008/07/09 20:50:41 joerg Exp $ */ +/* $NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $ */ /*- * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.54 2008/07/09 20:50:41 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -55,7 +55,7 @@ int sc_enabled; /* device is open */ int oldbuttons; /* mouse button status */ - struct device *sc_wsmousedev; + device_t sc_wsmousedev; }; static int lmsprobe(device_t, cfdata_t, void *); Index: src/sys/arch/i386/isa/mms.c diff -u src/sys/arch/i386/isa/mms.c:1.51 src/sys/arch/i386/isa/mms.c:1.52 --- src/sys/arch/i386/isa/mms.c:1.51 Wed Jul 9 20:54:13 2008 +++ src/sys/arch/i386/isa/mms.c Mon May 4 12:14:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mms.c,v 1.51 2008/07/09 20:54:13 joerg Exp $ */ +/* $NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $ */ /*- * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.51 2008/07/09 20:54:13 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -52,7 +52,7 @@ int sc_enabled; /* device is open */ - struct device *sc_wsmousedev; + device_t sc_wsmousedev; }; static int mmsprobe(device_t, cfdata_t, void *);