Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

struct device * -> device_t, no functional changes intended.

This commit is contained in:
cegger 2009-05-12 09:10:15 +00:00
parent 8a46564d1d
commit ab57cc6f1b
61 changed files with 336 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/isa/addcom_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: addcom_isa.c,v 1.18 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: addcom_isa.c,v 1.19 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 2000 Michael Graff. All rights reserved.
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.18 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.19 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -105,16 +105,15 @@ static int slave_iobases[8] = {
0x208
};
int addcomprobe(struct device *, cfdata_t, void *);
void addcomattach(struct device *, struct device *, void *);
int addcomprobe(device_t, cfdata_t, void *);
void addcomattach(device_t, device_t, void *);
int addcomintr(void *);
CFATTACH_DECL(addcom_isa, sizeof(struct addcom_softc),
addcomprobe, addcomattach, NULL, NULL);
int
addcomprobe(struct device *parent, cfdata_t self,
void *aux)
addcomprobe(device_t parent, cfdata_t self, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -185,7 +184,7 @@ out:
}
void
addcomattach(struct device *parent, struct device *self, void *aux)
addcomattach(device_t parent, device_t self, void *aux)
{
struct addcom_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

13
sys/dev/isa/adv_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: adv_isa.c,v 1.17 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: adv_isa.c,v 1.18 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.17 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.18 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -94,8 +94,8 @@ static int asc_ioport[ASC_IOADR_TABLE_MAX_IX] =
/******************************************************************************/
int adv_isa_probe(struct device *, cfdata_t, void *);
void adv_isa_attach(struct device *, struct device *, void *);
int adv_isa_probe(device_t, cfdata_t, void *);
void adv_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(adv_isa, sizeof(ASC_SOFTC),
adv_isa_probe, adv_isa_attach, NULL, NULL);
@ -103,8 +103,7 @@ CFATTACH_DECL(adv_isa, sizeof(ASC_SOFTC),
/******************************************************************************/
int
adv_isa_probe( struct device *parent, cfdata_t match,
void *aux)
adv_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -200,7 +199,7 @@ adv_isa_probe( struct device *parent, cfdata_t match,
void
adv_isa_attach(struct device *parent, struct device *self, void *aux)
adv_isa_attach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
ASC_SOFTC *sc = (void *) self;

13
sys/dev/isa/aha_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aha_isa.c,v 1.26 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: aha_isa.c,v 1.27 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.26 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.27 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -51,8 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.26 2009/05/12 08:44:19 cegger Exp $");
#define AHA_ISA_IOSIZE 4
int aha_isa_probe(struct device *, cfdata_t, void *);
void aha_isa_attach(struct device *, struct device *, void *);
int aha_isa_probe(device_t, cfdata_t, void *);
void aha_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(aha_isa, sizeof(struct aha_softc),
aha_isa_probe, aha_isa_attach, NULL, NULL);
@ -63,8 +63,7 @@ CFATTACH_DECL(aha_isa, sizeof(struct aha_softc),
* the actual probe routine to check it out.
*/
int
aha_isa_probe(struct device *parent, cfdata_t match,
void *aux)
aha_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -119,7 +118,7 @@ aha_isa_probe(struct device *parent, cfdata_t match,
* Attach all the sub-devices we can find
*/
void
aha_isa_attach(struct device *parent, struct device *self, void *aux)
aha_isa_attach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
struct aha_softc *sc = (void *)self;

11
sys/dev/isa/aic_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aic_isa.c,v 1.22 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: aic_isa.c,v 1.23 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.22 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.23 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.22 2009/05/12 08:44:19 cegger Exp $");
#include <dev/ic/aic6360reg.h>
#include <dev/ic/aic6360var.h>
int aic_isa_probe(struct device *, cfdata_t, void *);
int aic_isa_probe(device_t, cfdata_t, void *);
struct aic_isa_softc {
struct aic_softc sc_aic; /* real "aic" softc */
@ -98,8 +98,7 @@ CFATTACH_DECL(aic_isa, sizeof(struct aic_isa_softc),
* returns non-zero value if a controller is found.
*/
int
aic_isa_probe(struct device *parent, cfdata_t match,
void *aux)
aic_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -142,7 +141,7 @@ aic_isa_probe(struct device *parent, cfdata_t match,
}
void
aic_isa_attach(struct device *parent, struct device *self, void *aux)
aic_isa_attach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
struct aic_isa_softc *isc = (void *)self;

12
sys/dev/isa/aria.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aria.c,v 1.30 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: aria.c,v 1.31 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell. All rights reserved.
@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.30 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.31 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -134,8 +134,8 @@ struct aria_softc {
int sc_sendcmd_err;
};
int ariaprobe(struct device *, cfdata_t, void *);
void ariaattach(struct device *, struct device *, void *);
int ariaprobe(device_t, cfdata_t, void *);
void ariaattach(device_t, device_t, void *);
void ariaclose(void *);
int ariaopen(void *, int);
int ariareset(bus_space_tag_t, bus_space_handle_t);
@ -238,7 +238,7 @@ const struct audio_hw_if aria_hw_if = {
* Probe for the aria hardware.
*/
int
ariaprobe(struct device *parent, cfdata_t cf, void *aux)
ariaprobe(device_t parent, cfdata_t cf, void *aux)
{
bus_space_handle_t ioh;
struct isa_attach_args *ia;
@ -395,7 +395,7 @@ aria_do_kludge(
* pseudo-device driver.
*/
void
ariaattach(struct device *parent, struct device *self, void *aux)
ariaattach(device_t parent, device_t self, void *aux)
{
bus_space_handle_t ioh;
struct aria_softc *sc;

13
sys/dev/isa/ast.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ast.c,v 1.63 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: ast.c,v 1.64 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.63 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.64 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -64,16 +64,15 @@ struct ast_softc {
bus_space_handle_t sc_slaveioh[NSLAVES];
};
int astprobe(struct device *, cfdata_t, void *);
void astattach(struct device *, struct device *, void *);
int astprobe(device_t, cfdata_t, void *);
void astattach(device_t, device_t, void *);
int astintr(void *);
CFATTACH_DECL(ast, sizeof(struct ast_softc),
astprobe, astattach, NULL, NULL);
int
astprobe(struct device *parent, cfdata_t self,
void *aux)
astprobe(device_t parent, cfdata_t self, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -143,7 +142,7 @@ out:
}
void
astattach(struct device *parent, struct device *self, void *aux)
astattach(device_t parent, device_t self, void *aux)
{
struct ast_softc *sc = device_private(self);
struct isa_attach_args *ia = aux;

12
sys/dev/isa/aztech.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aztech.c,v 1.15 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: aztech.c,v 1.16 2009/05/12 09:10:15 cegger Exp $ */
/* $OpenBSD: aztech.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: aztech.c,v 1.11 2001/10/20 13:23:47 pva Exp $ */
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.15 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.16 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -77,8 +77,8 @@ __KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.15 2009/05/12 08:44:19 cegger Exp $");
#define AZ_DATA_ON (1 << 7)
#define AZ_DATA_OFF (0 << 7)
int az_probe(struct device *, cfdata_t, void *);
void az_attach(struct device *, struct device * self, void *);
int az_probe(device_t, cfdata_t, void *);
void az_attach(device_t, device_t self, void *);
int az_get_info(void *, struct radio_info *);
int az_set_info(void *, struct radio_info *);
@ -118,7 +118,7 @@ u_int8_t az_conv_vol(u_int8_t);
u_int8_t az_unconv_vol(u_int8_t);
int
az_probe(struct device *parent, cfdata_t cf, void *aux)
az_probe(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -161,7 +161,7 @@ az_probe(struct device *parent, cfdata_t cf, void *aux)
}
void
az_attach(struct device *parent, struct device *self, void *aux)
az_attach(device_t parent, device_t self, void *aux)
{
struct az_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

14
sys/dev/isa/bha_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bha_isa.c,v 1.33 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: bha_isa.c,v 1.34 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.33 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.34 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.33 2009/05/12 08:44:19 cegger Exp $");
#define BHA_ISA_IOSIZE 4
int bha_isa_probe(struct device *, cfdata_t, void *);
void bha_isa_attach(struct device *, struct device *, void *);
int bha_isa_probe(device_t, cfdata_t, void *);
void bha_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(bha_isa, sizeof(struct bha_softc),
bha_isa_probe, bha_isa_attach, NULL, NULL);
@ -62,8 +62,7 @@ CFATTACH_DECL(bha_isa, sizeof(struct bha_softc),
* the actual probe routine to check it out.
*/
int
bha_isa_probe(struct device *parent, cfdata_t match,
void *aux)
bha_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -118,8 +117,7 @@ bha_isa_probe(struct device *parent, cfdata_t match,
* Attach all the sub-devices we can find
*/
void
bha_isa_attach(struct device *parent, struct device *self,
void *aux)
bha_isa_attach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
struct bha_softc *sc = (void *)self;

13
sys/dev/isa/boca.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boca.c,v 1.52 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: boca.c,v 1.53 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.52 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.53 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -67,8 +67,8 @@ struct boca_softc {
callout_t fixup;
};
int bocaprobe(struct device *, cfdata_t, void *);
void bocaattach(struct device *, struct device *, void *);
int bocaprobe(device_t, cfdata_t, void *);
void bocaattach(device_t, device_t, void *);
int bocaintr(void *);
void boca_fixup(void *);
@ -76,8 +76,7 @@ CFATTACH_DECL(boca, sizeof(struct boca_softc),
bocaprobe, bocaattach, NULL, NULL);
int
bocaprobe(struct device *parent, cfdata_t self,
void *aux)
bocaprobe(device_t parent, cfdata_t self, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -148,7 +147,7 @@ out:
}
void
bocaattach(struct device *parent, struct device *self, void *aux)
bocaattach(device_t parent, device_t self, void *aux)
{
struct boca_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

12
sys/dev/isa/cec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cec.c,v 1.10 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: cec.c,v 1.11 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.10 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.11 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -87,8 +87,8 @@ struct cec_softc {
callout_t sc_timeout_ch;
};
int cecprobe(struct device *, cfdata_t, void *);
void cecattach(struct device *, struct device *, void *);
int cecprobe(device_t, cfdata_t, void *);
void cecattach(device_t, device_t, void *);
CFATTACH_DECL(cec, sizeof(struct cec_softc),
cecprobe, cecattach, NULL, NULL);
@ -138,7 +138,7 @@ int cecwtimeout = 0x10000;
int cecdmathresh = 3;
int
cecprobe(struct device *parent, cfdata_t match, void *aux)
cecprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -176,7 +176,7 @@ cecprobe(struct device *parent, cfdata_t match, void *aux)
}
void
cecattach(struct device *parent, struct device *self, void *aux)
cecattach(device_t parent, device_t self, void *aux)
{
struct cec_softc *sc = (struct cec_softc *)self;
struct isa_attach_args *ia = aux;

12
sys/dev/isa/daic_isa.c
View File

@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.18 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.19 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@ -58,11 +58,11 @@ struct daic_isa_softc {
/* local functions */
#ifdef __BROKEN_INDIRECT_CONFIG
static int daic_isa_probe(struct device *, void *, void *);
static int daic_isa_probe(device_t, void *, void *);
#else
static int daic_isa_probe(struct device *, cfdata_t, void *);
static int daic_isa_probe(device_t, cfdata_t, void *);
#endif
static void daic_isa_attach(struct device *, struct device *, void *);
static void daic_isa_attach(device_t, device_t, void *);
static int daic_isa_intr(void *);
CFATTACH_DECL(daic_isa, sizeof(struct daic_isa_softc),
@ -74,7 +74,7 @@ daic_isa_probe(parent, match, aux)
#else
daic_isa_probe(parent, cf, aux)
#endif
struct device *parent;
device_t parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
@ -120,7 +120,7 @@ bad:
}
static void
daic_isa_attach(struct device *parent, struct device *self, void *aux)
daic_isa_attach(device_t parent, device_t self, void *aux)
{
struct daic_isa_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

13
sys/dev/isa/dpt_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dpt_isa.c,v 1.19 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: dpt_isa.c,v 1.20 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.19 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.20 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.19 2009/05/12 08:44:19 cegger Exp $");
#define DPT_ISA_IOSIZE 16
#define DPT_ISA_MAXCCBS 16
static void dpt_isa_attach(struct device *, struct device *, void *);
static int dpt_isa_match(struct device *, cfdata_t, void *);
static void dpt_isa_attach(device_t, device_t, void *);
static int dpt_isa_match(device_t, cfdata_t, void *);
static int dpt_isa_probe(struct isa_attach_args *, int);
static int dpt_isa_wait(bus_space_handle_t, bus_space_tag_t, u_int8_t,
u_int8_t);
@ -93,8 +93,7 @@ dpt_isa_wait(bus_space_handle_t ioh, bus_space_tag_t iot, u_int8_t mask,
* Match a supported board.
*/
static int
dpt_isa_match(struct device *parent, cfdata_t match,
void *aux)
dpt_isa_match(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
int i;
@ -253,7 +252,7 @@ dpt_isa_probe(struct isa_attach_args *ia, int iobase)
* Attach a matched board.
*/
static void
dpt_isa_attach(struct device *parent, struct device *self, void *aux)
dpt_isa_attach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia;
isa_chipset_tag_t ic;

12
sys/dev/isa/ega.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ega.c,v 1.28 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: ega.c,v 1.29 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1999
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.28 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.29 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -99,8 +99,8 @@ static int egaconsole, ega_console_attached;
static struct egascreen ega_console_screen;
static struct ega_config ega_console_dc;
int ega_match(struct device *, cfdata_t, void *);
void ega_attach(struct device *, struct device *, void *);
int ega_match(device_t, cfdata_t, void *);
void ega_attach(device_t, device_t, void *);
static int ega_is_console(bus_space_tag_t);
static int ega_probe_col(bus_space_tag_t, bus_space_tag_t);
@ -429,7 +429,7 @@ ega_init(struct ega_config *vc, bus_space_tag_t iot, bus_space_tag_t memt, int m
}
int
ega_match(struct device *parent, cfdata_t match, void *aux)
ega_match(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
int mono;
@ -484,7 +484,7 @@ ega_match(struct device *parent, cfdata_t match, void *aux)
}
void
ega_attach(struct device *parent, struct device *self, void *aux)
ega_attach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
struct ega_softc *sc = (struct ega_softc *)self;

13
sys/dev/isa/gus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gus.c,v 1.104 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: gus.c,v 1.105 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1996, 1999 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.104 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.105 2009/05/12 09:10:15 cegger Exp $");
#include "gus.h"
#if NGUS > 0
@ -434,8 +434,8 @@ void stereo_dmaintr(void *);
* ISA bus driver routines
*/
int gusprobe(struct device *, cfdata_t, void *);
void gusattach(struct device *, struct device *, void *);
int gusprobe(device_t, cfdata_t, void *);
void gusattach(device_t, device_t, void *);
CFATTACH_DECL(gus, sizeof(struct gus_softc),
gusprobe, gusattach, NULL, NULL);
@ -653,8 +653,7 @@ struct audio_device gus_device = {
int
gusprobe(struct device *parent, cfdata_t match,
void *aux)
gusprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia;
int iobase, recdrq;
@ -814,7 +813,7 @@ bad1:
*/
void
gusattach(struct device *parent, struct device *self, void *aux)
gusattach(device_t parent, device_t self, void *aux)
{
struct gus_softc *sc;
struct isa_attach_args *ia;

14
sys/dev/isa/i82365_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365_isa.c,v 1.30 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: i82365_isa.c,v 1.31 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.30 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.31 2009/05/12 09:10:15 cegger Exp $");
#define PCICISADEBUG
@ -61,8 +61,8 @@ int pcicisa_debug = 0;
#define DPRINTF(arg)
#endif
int pcic_isa_probe(struct device *, cfdata_t, void *);
void pcic_isa_attach(struct device *, struct device *, void *);
int pcic_isa_probe(device_t, cfdata_t, void *);
void pcic_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(pcic_isa, sizeof(struct pcic_isa_softc),
pcic_isa_probe, pcic_isa_attach, NULL, NULL);
@ -88,8 +88,7 @@ static const struct pcmcia_chip_functions pcic_isa_functions = {
};
int
pcic_isa_probe(struct device *parent, cfdata_t match,
void *aux)
pcic_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -183,8 +182,7 @@ pcic_isa_probe(struct device *parent, cfdata_t match,
}
void
pcic_isa_attach( struct device *parent, struct device *self,
void *aux)
pcic_isa_attach(device_t parent, device_t self, void *aux)
{
struct pcic_softc *sc = (void *) self;
struct pcic_isa_softc *isc = (void *) self;

6
sys/dev/isa/i82365_isasubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365_isasubr.c,v 1.42 2009/03/16 09:34:17 cegger Exp $ */
/* $NetBSD: i82365_isasubr.c,v 1.43 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps. All rights reserved.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.42 2009/03/16 09:34:17 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.43 2009/05/12 09:10:15 cegger Exp $");
#define PCICISADEBUG
@ -269,7 +269,7 @@ pcic_isa_probe_interrupts(struct pcic_softc *sc, struct pcic_handle *h)
* which irq lines are actually hooked up to our pcic
*/
void
pcic_isa_config_interrupts(struct device *self)
pcic_isa_config_interrupts(device_t self)
{
struct pcic_softc *sc;
struct pcic_isa_softc *isc;

4
sys/dev/isa/i82365_isavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365_isavar.h,v 1.6 2005/12/11 12:22:02 christos Exp $ */
/* $NetBSD: i82365_isavar.h,v 1.7 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1998 Bill Sommerfeld. All rights reserved.
@ -52,6 +52,6 @@ void pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *);
void pcic_isa_bus_width_probe(struct pcic_softc *, bus_space_tag_t,
bus_space_handle_t, bus_addr_t, u_int32_t);
void pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *);
void pcic_isa_config_interrupts(struct device *);
void pcic_isa_config_interrupts(device_t);
void *pcic_isa_chip_intr_establish(pcmcia_chipset_handle_t,
struct pcmcia_function *, int, int (*) (void *), void *);

12
sys/dev/isa/if_ai.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ai.c,v 1.31 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_ai.c,v 1.32 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.31 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.32 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -98,8 +98,8 @@ static int check_ie_present(struct ie_softc*, bus_space_tag_t,
static int ai_find_mem_size(struct ai_softc*, bus_space_tag_t,
bus_size_t);
int ai_match(struct device *, cfdata_t, void *);
void ai_attach(struct device *, struct device *, void *);
int ai_match(device_t, cfdata_t, void *);
void ai_attach(device_t, device_t, void *);
/*
* AT&T StarLan support routines
@ -206,7 +206,7 @@ ai_write_24 (struct ie_softc *sc, int offset, int addr)
}
int
ai_match(struct device *parent, cfdata_t cf, void *aux)
ai_match(device_t parent, cfdata_t cf, void *aux)
{
int rv = 0;
u_int8_t val, type;
@ -302,7 +302,7 @@ out:
}
void
ai_attach(struct device *parent, struct device *self, void *aux)
ai_attach(device_t parent, device_t self, void *aux)
{
struct ai_softc *asc = (void *)self;
struct ie_softc *sc = &asc->sc_ie;

13
sys/dev/isa/if_cs_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_cs_isa.c,v 1.21 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_cs_isa.c,v 1.22 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright 1997
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.21 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.22 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -61,15 +61,14 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.21 2009/05/12 08:44:19 cegger Exp $"
#include <dev/ic/cs89x0var.h>
#include <dev/isa/cs89x0isavar.h>
int cs_isa_probe(struct device *, cfdata_t, void *);
void cs_isa_attach(struct device *, struct device *, void *);
int cs_isa_probe(device_t, cfdata_t, void *);
void cs_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(cs_isa, sizeof(struct cs_softc),
cs_isa_probe, cs_isa_attach, NULL, NULL);
int
cs_isa_probe(struct device *parent, cfdata_t cf,
void *aux)
cs_isa_probe(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -214,7 +213,7 @@ cs_isa_probe(struct device *parent, cfdata_t cf,
}
void
cs_isa_attach(struct device *parent, struct device *self, void *aux)
cs_isa_attach(device_t parent, device_t self, void *aux)
{
struct cs_softc *sc = (struct cs_softc *) self;
struct cs_softc_isa *isc = (void *) self;

14
sys/dev/isa/if_ef.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ef.c,v 1.29 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_ef.c,v 1.30 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.29 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.30 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -105,8 +105,8 @@ static void ef_mediastatus(struct ie_softc *, struct ifmediareq *);
/* Local routines */
static int ef_port_check(bus_space_tag_t, bus_space_handle_t);
int ef_match(struct device *, cfdata_t, void *);
void ef_attach(struct device *, struct device *, void *);
int ef_match(device_t, cfdata_t, void *);
void ef_attach(device_t, device_t, void *);
/*
* This keeps track of which ISAs have been through an ie probe sequence.
@ -121,7 +121,7 @@ void ef_attach(struct device *, struct device *, void *);
struct ef_isabus {
LIST_ENTRY(ef_isabus) isa_link;
struct device *isa_bus;
device_t isa_bus;
int bus_state;
@ -320,7 +320,7 @@ ef_mediastatus(struct ie_softc *sc, struct ifmediareq *ifmr)
}
int
ef_match(struct device *parent, cfdata_t cf, void *aux)
ef_match(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args * const ia = aux;
@ -470,7 +470,7 @@ ef_match(struct device *parent, cfdata_t cf, void *aux)
}
void
ef_attach(struct device *parent, struct device *self, void *aux)
ef_attach(device_t parent, device_t self, void *aux)
{
struct ef_softc *esc = (void *)self;
struct ie_softc *sc = &esc->sc_ie;

13
sys/dev/isa/if_eg.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_eg.c,v 1.79 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_eg.c,v 1.80 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.79 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.80 2009/05/12 09:10:15 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -121,8 +121,8 @@ struct eg_softc {
#endif
};
int egprobe(struct device *, cfdata_t, void *);
void egattach(struct device *, struct device *, void *);
int egprobe(device_t, cfdata_t, void *);
void egattach(device_t, device_t, void *);
CFATTACH_DECL(eg, sizeof(struct eg_softc),
egprobe, egattach, NULL, NULL);
@ -298,8 +298,7 @@ egreadPCB(bus_space_tag_t iot, bus_space_handle_t ioh, u_int8_t *pcb)
*/
int
egprobe(struct device *parent, cfdata_t match,
void *aux)
egprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -384,7 +383,7 @@ egprobe(struct device *parent, cfdata_t match,
}
void
egattach(struct device *parent, struct device *self, void *aux)
egattach(device_t parent, device_t self, void *aux)
{
struct eg_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

13
sys/dev/isa/if_el.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_el.c,v 1.83 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_el.c,v 1.84 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.83 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.84 2009/05/12 09:10:15 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -102,8 +102,8 @@ void elread(struct el_softc *, int);
struct mbuf *elget(struct el_softc *sc, int);
static inline void el_hardreset(struct el_softc *);
int elprobe(struct device *, cfdata_t, void *);
void elattach(struct device *, struct device *, void *);
int elprobe(device_t, cfdata_t, void *);
void elattach(device_t, device_t, void *);
CFATTACH_DECL(el, sizeof(struct el_softc),
elprobe, elattach, NULL, NULL);
@ -115,8 +115,7 @@ CFATTACH_DECL(el, sizeof(struct el_softc),
* (XXX - cgd -- needs help)
*/
int
elprobe(struct device *parent, cfdata_t match,
void *aux)
elprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -203,7 +202,7 @@ elprobe(struct device *parent, cfdata_t match,
* assume that the IRQ given is correct.
*/
void
elattach(struct device *parent, struct device *self, void *aux)
elattach(device_t parent, device_t self, void *aux)
{
struct el_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

12
sys/dev/isa/if_ix.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ix.c,v 1.32 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_ix.c,v 1.33 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.32 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.33 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -102,8 +102,8 @@ static void ix_eeprom_outbits(bus_space_tag_t, bus_space_handle_t, int, int);
static int ix_eeprom_inbits (bus_space_tag_t, bus_space_handle_t);
static void ix_eeprom_clock (bus_space_tag_t, bus_space_handle_t, int);
int ix_match(struct device *, cfdata_t, void *);
void ix_attach(struct device *, struct device *, void *);
int ix_match(device_t, cfdata_t, void *);
void ix_attach(device_t, device_t, void *);
/*
* EtherExpress/16 support routines
@ -468,7 +468,7 @@ ix_mediastatus(struct ie_softc *sc, struct ifmediareq *ifmr)
}
int
ix_match(struct device *parent, cfdata_t cf, void *aux)
ix_match(device_t parent, cfdata_t cf, void *aux)
{
int i;
int rv = 0;
@ -672,7 +672,7 @@ out:
}
void
ix_attach(struct device *parent, struct device *self, void *aux)
ix_attach(device_t parent, device_t self, void *aux)
{
struct ix_softc *isc = (void *)self;
struct ie_softc *sc = &isc->sc_ie;

13
sys/dev/isa/if_iy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_iy.c,v 1.85 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_iy.c,v 1.86 2009/05/12 09:10:15 cegger Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.85 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.86 2009/05/12 09:10:15 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -170,8 +170,8 @@ int in_iftint = 0;
int iy_mediachange(struct ifnet *);
void iy_mediastatus(struct ifnet *, struct ifmediareq *);
int iyprobe(struct device *, cfdata_t, void *);
void iyattach(struct device *, struct device *, void *);
int iyprobe(device_t, cfdata_t, void *);
void iyattach(device_t, device_t, void *);
static u_int16_t eepromread(bus_space_tag_t, bus_space_handle_t, int);
@ -185,8 +185,7 @@ static u_int8_t eepro_irqmap[] = EEPP_INTMAP;
static u_int8_t eepro_revirqmap[] = EEPP_RINTMAP;
int
iyprobe(struct device *parent, cfdata_t match,
void *aux)
iyprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
u_int16_t eaddr[8];
@ -285,7 +284,7 @@ out:
}
void
iyattach(struct device *parent, struct device *self, void *aux)
iyattach(device_t parent, device_t self, void *aux)
{
struct iy_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

12
sys/dev/isa/if_lc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_lc_isa.c,v 1.32 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_lc_isa.c,v 1.33 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.32 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.33 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.32 2009/05/12 08:44:19 cegger Exp $"
extern struct cfdriver lc_cd;
static int lemac_isa_find(lemac_softc_t *, struct isa_attach_args *, int);
static int lemac_isa_probe(struct device *, cfdata_t, void *);
static void lemac_isa_attach(struct device *, struct device *, void *);
static int lemac_isa_probe(device_t, cfdata_t, void *);
static void lemac_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(lc_isa, sizeof(lemac_softc_t),
lemac_isa_probe, lemac_isa_attach, NULL, NULL);
@ -182,7 +182,7 @@ outio:
}
static int
lemac_isa_probe(struct device *parent, cfdata_t match, void *aux)
lemac_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
cfdata_t cf = match;
@ -194,7 +194,7 @@ lemac_isa_probe(struct device *parent, cfdata_t match, void *aux)
}
static void
lemac_isa_attach(struct device *parent, struct device *self, void *aux)
lemac_isa_attach(device_t parent, device_t self, void *aux)
{
lemac_softc_t *sc = (void *)self;
struct isa_attach_args *ia = aux;

8
sys/dev/isa/if_le_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_isa.c,v 1.47 2008/04/28 20:23:52 martin Exp $ */
/* $NetBSD: if_le_isa.c,v 1.48 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.47 2008/04/28 20:23:52 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.48 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -129,7 +129,7 @@ struct le_isa_params {
};
int lance_isa_probe(struct isa_attach_args *, struct le_isa_params *, int);
void le_isa_attach(struct device *, struct le_softc *,
void le_isa_attach(device_t, struct le_softc *,
struct isa_attach_args *, struct le_isa_params *);
int le_isa_intredge(void *);
@ -295,7 +295,7 @@ le_bicc_attach(device_t parent, device_t self, void *aux)
}
void
le_isa_attach(struct device *parent, struct le_softc *lesc,
le_isa_attach(device_t parent, struct le_softc *lesc,
struct isa_attach_args *ia, struct le_isa_params *p)
{
struct lance_softc *sc = &lesc->sc_am7990.lsc;

18
sys/dev/isa/if_ntwoc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ntwoc_isa.c,v 1.20 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_ntwoc_isa.c,v 1.21 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
* Copyright (c) 1996 John Hay.
@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ntwoc_isa.c,v 1.20 2009/05/12 08:44:19 cegger Exp $
* $Id: if_ntwoc_isa.c,v 1.21 2009/05/12 09:10:15 cegger Exp $
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.20 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.21 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.20 2009/05/12 08:44:19 cegger Exp
#endif
#if __NetBSD_Version__ >= 104160000
static void ntwoc_isa_config_interrupts(struct device *);
static void ntwoc_isa_config_interrupts(device_t);
#else
#define SCA_BASECLOCK 9830400
#endif
@ -84,8 +84,8 @@ struct ntwoc_isa_softc {
struct sca_softc sc_sca; /* the SCA itself */
};
static int ntwoc_isa_probe(struct device *, cfdata_t, void *);
static void ntwoc_isa_attach(struct device *, struct device *, void *);
static int ntwoc_isa_probe(device_t, cfdata_t, void *);
static void ntwoc_isa_attach(device_t, device_t, void *);
static void ntwoc_isa_clock_callback(void *, int, int);
static void ntwoc_isa_dtr_callback(void *, int, int);
@ -186,7 +186,7 @@ ntwoc_isa_set_off(struct sca_softc *sca)
}
static int
ntwoc_isa_probe(struct device *parent, cfdata_t match, void *aux)
ntwoc_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia;
bus_space_tag_t iot, memt;
@ -381,7 +381,7 @@ out:
* we win! attach the card
*/
static void
ntwoc_isa_attach(struct device *parent, struct device *self, void *aux)
ntwoc_isa_attach(device_t parent, device_t self, void *aux)
{
struct ntwoc_isa_softc *sc;
struct isa_attach_args *ia;
@ -802,7 +802,7 @@ ntwoc_isa_setup_memory(struct sca_softc *sc)
* get the base clock frequency
*/
static void
ntwoc_isa_config_interrupts(struct device *self)
ntwoc_isa_config_interrupts(device_t self)
{
struct ntwoc_isa_softc *sc;

13
sys/dev/isa/if_sm_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sm_isa.c,v 1.21 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_sm_isa.c,v 1.22 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.21 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.22 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.21 2009/05/12 08:44:19 cegger Exp $"
#include <dev/isa/isavar.h>
int sm_isa_match(struct device *, cfdata_t, void *);
void sm_isa_attach(struct device *, struct device *, void *);
int sm_isa_match(device_t, cfdata_t, void *);
void sm_isa_attach(device_t, device_t, void *);
struct sm_isa_softc {
struct smc91cxx_softc sc_smc; /* real "smc" softc */
@ -73,8 +73,7 @@ CFATTACH_DECL(sm_isa, sizeof(struct sm_isa_softc),
sm_isa_match, sm_isa_attach, NULL, NULL);
int
sm_isa_match(struct device *parent, cfdata_t match,
void *aux)
sm_isa_match(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -152,7 +151,7 @@ sm_isa_match(struct device *parent, cfdata_t match,
}
void
sm_isa_attach(struct device *parent, struct device *self, void *aux)
sm_isa_attach(device_t parent, device_t self, void *aux)
{
struct sm_isa_softc *isc = (struct sm_isa_softc *)self;
struct smc91cxx_softc *sc = &isc->sc_smc;

18
sys/dev/isa/if_tr_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tr_isa.c,v 1.22 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_tr_isa.c,v 1.23 2009/05/12 09:10:15 cegger Exp $ */
/* XXXJRT changes isa_attach_args too early!! */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.22 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.23 2009/05/12 09:10:15 cegger Exp $");
#undef TRISADEBUG
@ -55,10 +55,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.22 2009/05/12 08:44:19 cegger Exp $"
#include <dev/ic/tropicvar.h>
int tr_isa_probe(struct device *, cfdata_t, void *);
int trtcm_isa_probe(struct device *, cfdata_t, void *);
int tribm_isa_probe(struct device *, cfdata_t, void *);
void tr_isa_attach(struct device *, struct device *, void *);
int tr_isa_probe(device_t, cfdata_t, void *);
int trtcm_isa_probe(device_t, cfdata_t, void *);
int tribm_isa_probe(device_t, cfdata_t, void *);
void tr_isa_attach(device_t, device_t, void *);
int tr_isa_map_io(struct isa_attach_args *, bus_space_handle_t *,
bus_space_handle_t *);
void tr_isa_unmap_io(struct isa_attach_args *, bus_space_handle_t,
@ -72,7 +72,7 @@ void tr_isa_dumpaip(bus_space_tag_t, bus_space_handle_t);
/*
* List of manufacturer specific probe routines. Order is important.
*/
int (*tr_isa_probe_list[])(struct device *, cfdata_t, void *) = {
int (*tr_isa_probe_list[])(device_t, cfdata_t, void *) = {
trtcm_isa_probe,
tribm_isa_probe,
0
@ -128,7 +128,7 @@ static u_char tr_isa_id[] = {
*/
int
tr_isa_probe(struct device *parent, cfdata_t match, void *aux)
tr_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
int i;
@ -192,7 +192,7 @@ tr_isa_probe(struct device *parent, cfdata_t match, void *aux)
int trtcm_setspeed(struct tr_softc *, int);
void
tr_isa_attach(struct device *parent, struct device *self, void *aux)
tr_isa_attach(device_t parent, device_t self, void *aux)
{
struct tr_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;

9
sys/dev/isa/if_tribm_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tribm_isa.c,v 1.13 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_tribm_isa.c,v 1.14 2009/05/12 09:10:15 cegger Exp $ */
/* XXXJRT changes isa_attach_args too early */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.13 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.14 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,15 +50,14 @@ __KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.13 2009/05/12 08:44:19 cegger Exp
#include <dev/ic/tropicreg.h>
#include <dev/ic/tropicvar.h>
int tribm_isa_probe(struct device *, cfdata_t, void *);
int tribm_isa_probe(device_t, cfdata_t, void *);
int tr_isa_map_io(struct isa_attach_args *, bus_space_handle_t *,
bus_space_handle_t *);
void tr_isa_unmap_io(struct isa_attach_args *, bus_space_handle_t,
bus_space_handle_t);
int
tribm_isa_probe(struct device *parent, cfdata_t match,
void *aux)
tribm_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
static int irq_f[4] = { 9, 3, 6, 7 };

9
sys/dev/isa/if_trtcm_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_trtcm_isa.c,v 1.18 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_trtcm_isa.c,v 1.19 2009/05/12 09:10:15 cegger Exp $ */
/* XXXJRT verify doens't change isa_attach_args too early */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.18 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.19 2009/05/12 09:10:15 cegger Exp $");
#undef TRTCMISADEBUG
@ -61,7 +61,7 @@ u_int16_t tcmreadeeprom(bus_space_tag_t, bus_space_handle_t, int);
void tcmdumpeeprom(bus_space_tag_t, bus_space_handle_t);
#endif
int trtcm_isa_probe(struct device *, cfdata_t, void *);
int trtcm_isa_probe(device_t, cfdata_t, void *);
int trtcm_isa_mediachange(struct tr_softc *);
void trtcm_isa_mediastatus(struct tr_softc *, struct ifmediareq *);
@ -190,8 +190,7 @@ trtcm_isa_mediastatus(struct tr_softc *sc, struct ifmediareq *ifmr)
/* XXX hard coded constants in readeeprom elink_idseq */
int
trtcm_isa_probe(struct device *parent, cfdata_t match,
void *aux)
trtcm_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
int bus = device_unit(parent);

12
sys/dev/isa/if_tscs_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tscs_isa.c,v 1.10 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: if_tscs_isa.c,v 1.11 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.10 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.11 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -57,14 +57,14 @@ __KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.10 2009/05/12 08:44:19 cegger Exp
#include <dev/ic/cs89x0var.h>
#include <dev/isa/cs89x0isavar.h>
int tscs_isa_probe(struct device *, cfdata_t, void *);
void tscs_isa_attach(struct device *, struct device *, void *);
int tscs_isa_probe(device_t, cfdata_t, void *);
void tscs_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(tscs_isa, sizeof(struct cs_softc),
tscs_isa_probe, tscs_isa_attach, NULL, NULL);
int
tscs_isa_probe(struct device *parent, cfdata_t cf, void *aux)
tscs_isa_probe(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -168,7 +168,7 @@ tscs_isa_probe(struct device *parent, cfdata_t cf, void *aux)
}
void
tscs_isa_attach(struct device *parent, struct device *self, void *aux)
tscs_isa_attach(device_t parent, device_t self, void *aux)
{
struct cs_softc *sc = (struct cs_softc *) self;
struct cs_softc_isa *isc = (void *) self;

13
sys/dev/isa/ioat66.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioat66.c,v 1.19 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: ioat66.c,v 1.20 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.19 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.20 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -68,16 +68,15 @@ struct ioat66_softc {
int ioatbases[NSLAVES]={0x220,0x228,0x240,0x248,0x260,0x268};
#define IOAT66SHARED 0x208
int ioat66probe(struct device *, cfdata_t, void *);
void ioat66attach(struct device *, struct device *, void *);
int ioat66probe(device_t, cfdata_t, void *);
void ioat66attach(device_t, device_t, void *);
int ioat66intr(void *);
CFATTACH_DECL(ioat, sizeof(struct ioat66_softc),
ioat66probe, ioat66attach, NULL, NULL);
int
ioat66probe(struct device *parent, cfdata_t self,
void *aux)
ioat66probe(device_t parent, cfdata_t self, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -143,7 +142,7 @@ out:
}
void
ioat66attach(struct device *parent, struct device *self, void *aux)
ioat66attach(device_t parent, device_t self, void *aux)
{
struct ioat66_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

6
sys/dev/isa/isadma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isadma.c,v 1.60 2009/03/14 21:04:20 dsl Exp $ */
/* $NetBSD: isadma.c,v 1.61 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.60 2009/03/14 21:04:20 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.61 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -138,7 +138,7 @@ _isa_dmamask(struct isa_dma_state *ids, int chan)
* _isa_dmainit(): Initialize the isa_dma_state for this chipset.
*/
void
_isa_dmainit(struct isa_dma_state *ids, bus_space_tag_t bst, bus_dma_tag_t dmat, struct device *dev)
_isa_dmainit(struct isa_dma_state *ids, bus_space_tag_t bst, bus_dma_tag_t dmat, device_t dev)
{
int chan;

6
sys/dev/isa/isadmavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isadmavar.h,v 1.23 2008/04/28 20:23:52 martin Exp $ */
/* $NetBSD: isadmavar.h,v 1.24 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@ -46,7 +46,7 @@
* frob the controller.
*/
struct isa_dma_state {
struct device *ids_dev; /* associated device (for dv_xname) */
device_t ids_dev; /* associated device (for dv_xname) */
bus_space_tag_t ids_bst; /* bus space tag for DMA controller */
bus_space_handle_t ids_dma1h; /* handle for DMA controller #1 */
bus_space_handle_t ids_dma2h; /* handle for DMA controller #2 */
@ -95,7 +95,7 @@ struct proc;
struct malloc_type;
void _isa_dmainit(struct isa_dma_state *, bus_space_tag_t,
bus_dma_tag_t, struct device *);
bus_dma_tag_t, device_t);
int _isa_dmacascade(struct isa_dma_state *, int);

4
sys/dev/isa/isavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isavar.h,v 1.52 2008/04/28 20:23:52 martin Exp $ */
/* $NetBSD: isavar.h,v 1.53 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1997, 2001 The NetBSD Foundation, Inc.
@ -141,7 +141,7 @@ struct isa_pnpname {
struct isa_knowndev {
TAILQ_ENTRY(isa_knowndev) ik_list;
uintptr_t ik_key;
struct device *ik_claimed;
device_t ik_claimed;
/*
* The rest of these fields correspond to isa_attach_args

10
sys/dev/isa/isic_isa.c
View File

@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.34 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.35 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@ -74,9 +74,9 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.34 2009/05/12 08:44:19 cegger Exp $")
extern const struct isdn_layer1_isdnif_driver isic_std_driver;
/* local functions */
static int isic_isa_probe(struct device *, cfdata_t, void *);
static int isic_isa_probe(device_t, cfdata_t, void *);
static void isic_isa_attach(struct device *, struct device *, void *);
static void isic_isa_attach(device_t, device_t, void *);
static int setup_io_map(int flags, bus_space_tag_t iot,
bus_space_tag_t memt, bus_size_t iobase, bus_size_t maddr,
int *num_mappings, struct isic_io_map *maps, int *iosize,
@ -94,7 +94,7 @@ CFATTACH_DECL(isic_isa, sizeof(struct isic_softc),
* Probe card
*/
static int
isic_isa_probe(struct device *parent, cfdata_t cf, void *aux)
isic_isa_probe(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t memt = ia->ia_memt, iot = ia->ia_iot;
@ -775,7 +775,7 @@ isicattach(int flags, struct isic_softc *sc)
* Attach the card
*/
static void
isic_isa_attach(struct device *parent, struct device *self, void *aux)
isic_isa_attach(device_t parent, device_t self, void *aux)
{
struct isic_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

8
sys/dev/isa/isic_isa_tel_s0163.c
View File

@ -37,7 +37,7 @@
* isic - I4B Siemens ISDN Chipset Driver for Teles S0/16.3
* ========================================================
*
* $Id: isic_isa_tel_s0163.c,v 1.11 2009/05/12 08:44:19 cegger Exp $
* $Id: isic_isa_tel_s0163.c,v 1.12 2009/05/12 09:10:15 cegger Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
@ -49,7 +49,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.11 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.12 2009/05/12 09:10:15 cegger Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_TEL_S0_16_3
@ -416,7 +416,7 @@ set_softc(struct isic_softc *sc, struct isa_attach_args *ia, int unit)
}
int
isic_probe_s0163(struct device *dev, cfdata_t cf,
isic_probe_s0163(device_t dev, cfdata_t cf,
struct isa_attach_args *ia)
{
u_char byte;
@ -537,7 +537,7 @@ isic_attach_s0163(struct isa_device *dev)
#elif defined(__bsdi__)
extern int
isic_attach_s0163(struct device *parent, struct device *self, struct isa_attach_args *ia)
isic_attach_s0163(device_t parent, device_t self, struct isa_attach_args *ia)
{
u_char irq;
struct isic_softc *sc = (struct isic_softc *)self;

13
sys/dev/isa/mcd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcd.c,v 1.108 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: mcd.c,v 1.109 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.108 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.109 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -190,8 +190,8 @@ int mcd_getqchan(struct mcd_softc *, union mcd_qchninfo *, int);
int mcd_setlock(struct mcd_softc *, int);
int mcd_find(bus_space_tag_t, bus_space_handle_t, struct mcd_softc *);
int mcdprobe(struct device *, cfdata_t, void *);
void mcdattach(struct device *, struct device *, void *);
int mcdprobe(device_t, cfdata_t, void *);
void mcdattach(device_t, device_t, void *);
CFATTACH_DECL(mcd, sizeof(struct mcd_softc),
mcdprobe, mcdattach, NULL, NULL);
@ -235,7 +235,7 @@ struct dkdriver mcddkdriver = { mcdstrategy, NULL, };
#define DELAY_GETREPLY 100000 /* 100000 * 25us */
void
mcdattach(struct device *parent, struct device *self, void *aux)
mcdattach(device_t parent, device_t self, void *aux)
{
struct mcd_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
@ -909,8 +909,7 @@ mcd_find(bus_space_tag_t iot, bus_space_handle_t ioh, struct mcd_softc *sc)
}
int
mcdprobe(struct device *parent, cfdata_t match,
void *aux)
mcdprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
struct mcd_softc sc;

13
sys/dev/isa/moxa_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: moxa_isa.c,v 1.18 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: moxa_isa.c,v 1.19 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.18 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.19 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -64,16 +64,15 @@ struct moxa_isa_softc {
bus_space_handle_t sc_slaveioh[NSLAVES];
};
int moxa_isaprobe(struct device *, cfdata_t, void *);
void moxa_isaattach(struct device *, struct device *, void *);
int moxa_isaprobe(device_t, cfdata_t, void *);
void moxa_isaattach(device_t, device_t, void *);
int moxa_isaintr(void *);
CFATTACH_DECL(moxa_isa, sizeof(struct moxa_isa_softc),
moxa_isaprobe, moxa_isaattach, NULL, NULL);
int
moxa_isaprobe(struct device *parent, cfdata_t self,
void *aux)
moxa_isaprobe(device_t parent, cfdata_t self, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -142,7 +141,7 @@ out:
}
void
moxa_isaattach(struct device *parent, struct device *self, void *aux)
moxa_isaattach(device_t parent, device_t self, void *aux)
{
struct moxa_isa_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

13
sys/dev/isa/pcdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcdisplay.c,v 1.37 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: pcdisplay.c,v 1.38 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1998
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.37 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.38 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,8 +71,8 @@ struct pcdisplay_softc {
static int pcdisplayconsole, pcdisplay_console_attached;
static struct pcdisplay_config pcdisplay_console_dc;
int pcdisplay_match(struct device *, cfdata_t, void *);
void pcdisplay_attach(struct device *, struct device *, void *);
int pcdisplay_match(device_t, cfdata_t, void *);
void pcdisplay_attach(device_t, device_t, void *);
static int pcdisplay_is_console(bus_space_tag_t);
static int pcdisplay_probe_col(bus_space_tag_t, bus_space_tag_t);
@ -219,8 +219,7 @@ pcdisplay_init(struct pcdisplay_config *dc, bus_space_tag_t iot, bus_space_tag_t
}
int
pcdisplay_match(struct device *parent, cfdata_t match,
void *aux)
pcdisplay_match(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
int mono;
@ -280,7 +279,7 @@ pcdisplay_match(struct device *parent, cfdata_t match,
}
void
pcdisplay_attach(struct device *parent, struct device *self, void *aux)
pcdisplay_attach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
struct pcdisplay_softc *sc = (struct pcdisplay_softc *)self;

12
sys/dev/isa/radiotrack.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: radiotrack.c,v 1.17 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: radiotrack.c,v 1.18 2009/05/12 09:10:15 cegger Exp $ */
/* $OpenBSD: radiotrack.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radiotrack.c,v 1.3 2001/10/18 16:51:36 pva Exp $ */
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.17 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.18 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -90,8 +90,8 @@ __KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.17 2009/05/12 08:44:19 cegger Exp $
#define RT_VOLUME_STEADY (3 << 6)
#define RT_VOLUME_DELAY 100000
int rt_probe(struct device *, cfdata_t, void *);
void rt_attach(struct device *, struct device * self, void *);
int rt_probe(device_t, cfdata_t, void *);
void rt_attach(device_t, device_t self, void *);
int rt_get_info(void *, struct radio_info *);
int rt_set_info(void *, struct radio_info *);
@ -131,7 +131,7 @@ u_int8_t rt_conv_vol(u_int8_t);
u_int8_t rt_unconv_vol(u_int8_t);
int
rt_probe(struct device *parent, cfdata_t cf, void *aux)
rt_probe(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -174,7 +174,7 @@ rt_probe(struct device *parent, cfdata_t cf, void *aux)
}
void
rt_attach(struct device *parent, struct device *self, void *aux)
rt_attach(device_t parent, device_t self, void *aux)
{
struct rt_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;

13
sys/dev/isa/radiotrack2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: radiotrack2.c,v 1.14 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: radiotrack2.c,v 1.15 2009/05/12 09:10:15 cegger Exp $ */
/* $OpenBSD: radiotrack2.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radiotrack2.c,v 1.2 2001/10/18 16:51:36 pva Exp $ */
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: radiotrack2.c,v 1.14 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: radiotrack2.c,v 1.15 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -80,8 +80,8 @@ __KERNEL_RCSID(0, "$NetBSD: radiotrack2.c,v 1.14 2009/05/12 08:44:19 cegger Exp
#define RTII_READ_CLOCK_LOW (RTII_DATA_ON | RTII_CLCK_OFF | RTII_WREN_OFF)
#define RTII_READ_CLOCK_HIGH (RTII_DATA_ON | RTII_CLCK_ON | RTII_WREN_OFF)
int rtii_probe(struct device *, cfdata_t, void *);
void rtii_attach(struct device *, struct device * self, void *);
int rtii_probe(device_t, cfdata_t, void *);
void rtii_attach(device_t, device_t self, void *);
int rtii_get_info(void *, struct radio_info *);
int rtii_set_info(void *, struct radio_info *);
@ -121,8 +121,7 @@ void rtii_rset(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int32_t);
void rtii_write_bit(bus_space_tag_t, bus_space_handle_t, bus_size_t, int);
int
rtii_probe(struct device *parent, cfdata_t cf,
void *aux)
rtii_probe(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -165,7 +164,7 @@ rtii_probe(struct device *parent, cfdata_t cf,
}
void
rtii_attach(struct device *parent, struct device *self, void *aux)
rtii_attach(device_t parent, device_t self, void *aux)
{
struct rtii_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;

13
sys/dev/isa/rtfps.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtfps.c,v 1.56 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: rtfps.c,v 1.57 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.56 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.57 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -66,16 +66,15 @@ struct rtfps_softc {
bus_space_handle_t sc_slaveioh[NSLAVES];
};
int rtfpsprobe(struct device *, cfdata_t, void *);
void rtfpsattach(struct device *, struct device *, void *);
int rtfpsprobe(device_t, cfdata_t, void *);
void rtfpsattach(device_t, device_t, void *);
int rtfpsintr(void *);
CFATTACH_DECL(rtfps, sizeof(struct rtfps_softc),
rtfpsprobe, rtfpsattach, NULL, NULL);
int
rtfpsprobe(struct device *parent, cfdata_t self,
void *aux)
rtfpsprobe(device_t parent, cfdata_t self, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -141,7 +140,7 @@ out:
}
void
rtfpsattach(struct device *parent, struct device *self, void *aux)
rtfpsattach(device_t parent, device_t self, void *aux)
{
struct rtfps_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

13
sys/dev/isa/satlink.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: satlink.c,v 1.41 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: satlink.c,v 1.42 2009/05/12 09:10:15 cegger Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.41 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.42 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,8 +93,8 @@ struct satlink_softc {
*/
#define SATLINK_TIMEOUT (hz/10)
int satlinkprobe(struct device *, cfdata_t, void *);
void satlinkattach(struct device *, struct device *, void *);
int satlinkprobe(device_t, cfdata_t, void *);
void satlinkattach(device_t, device_t, void *);
void satlinktimeout(void *);
CFATTACH_DECL(satlink, sizeof(struct satlink_softc),
@ -115,8 +115,7 @@ const struct cdevsw satlink_cdevsw = {
};
int
satlinkprobe(struct device *parent, cfdata_t match,
void *aux)
satlinkprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -159,7 +158,7 @@ satlinkprobe(struct device *parent, cfdata_t match,
}
void
satlinkattach(struct device *parent, struct device *self, void *aux)
satlinkattach(device_t parent, device_t self, void *aux)
{
struct satlink_softc *sc = (struct satlink_softc *)self;
struct isa_attach_args *ia = aux;

4
sys/dev/isa/sbdspvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbdspvar.h,v 1.59 2008/03/15 21:09:02 cube Exp $ */
/* $NetBSD: sbdspvar.h,v 1.60 2009/05/12 09:10:15 cegger Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@ -182,7 +182,7 @@ struct sbdsp_softc {
#define SBMPU_EXTERNAL 1
#define SBMPU_INTERNAL 0
#define SBMPU_NONE -1
struct device *sc_mpudev;
device_t sc_mpudev;
bus_space_tag_t sc_mpu_iot; /* tag */
bus_space_handle_t sc_mpu_ioh; /* handle */
#endif

13
sys/dev/isa/seagate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: seagate.c,v 1.68 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: seagate.c,v 1.69 2009/05/12 09:10:15 cegger Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.68 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.69 2009/05/12 09:10:15 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -294,8 +294,8 @@ int sea_abort(struct sea_softc *, struct sea_scb *scb);
void sea_grow_scb(struct sea_softc *);
int seaprobe(struct device *, cfdata_t, void *);
void seaattach(struct device *, struct device *, void *);
int seaprobe(device_t, cfdata_t, void *);
void seaattach(device_t, device_t, void *);
CFATTACH_DECL(sea, sizeof(struct sea_softc),
seaprobe, seaattach, NULL, NULL);
@ -326,8 +326,7 @@ sea_queue_length(struct sea_softc *sea)
* Returns 1 if card recognized, 0 if errors.
*/
int
seaprobe(struct device *parent, cfdata_t match,
void *aux)
seaprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
int i, type = 0;
@ -385,7 +384,7 @@ seaprobe(struct device *parent, cfdata_t match,
* Attach all sub-devices we can find
*/
void
seaattach(struct device *parent, struct device *self, void *aux)
seaattach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
struct sea_softc *sea = (void *)self;

13
sys/dev/isa/sf16fmr2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sf16fmr2.c,v 1.14 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: sf16fmr2.c,v 1.15 2009/05/12 09:10:16 cegger Exp $ */
/* $OpenBSD: sf16fmr2.c,v 1.3 2001/12/18 18:48:08 mickey Exp $ */
/* $RuOBSD: sf16fmr2.c,v 1.12 2001/10/18 16:51:36 pva Exp $ */
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sf16fmr2.c,v 1.14 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: sf16fmr2.c,v 1.15 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -80,8 +80,8 @@ __KERNEL_RCSID(0, "$NetBSD: sf16fmr2.c,v 1.14 2009/05/12 08:44:19 cegger Exp $")
#define SF16FMR2_READ_CLOCK_HIGH \
SF16FMR2_DATA_ON | SF16FMR2_CLCK_ON | SF16FMR2_WREN_OFF
int sf2r_probe(struct device *, cfdata_t, void *);
void sf2r_attach(struct device *, struct device * self, void *);
int sf2r_probe(device_t, cfdata_t, void *);
void sf2r_attach(device_t, device_t self, void *);
int sf2r_get_info(void *, struct radio_info *);
int sf2r_set_info(void *, struct radio_info *);
@ -121,8 +121,7 @@ void sf2r_rset(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int32_t);
void sf2r_write_bit(bus_space_tag_t, bus_space_handle_t, bus_size_t, int);
int
sf2r_probe(struct device *parent, cfdata_t cf,
void *aux)
sf2r_probe(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -165,7 +164,7 @@ sf2r_probe(struct device *parent, cfdata_t cf,
}
void
sf2r_attach(struct device *parent, struct device *self, void *aux)
sf2r_attach(device_t parent, device_t self, void *aux)
{
struct sf2r_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;

13
sys/dev/isa/slhci_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: slhci_isa.c,v 1.10 2009/05/12 08:44:19 cegger Exp $ */
/* $NetBSD: slhci_isa.c,v 1.11 2009/05/12 09:10:16 cegger Exp $ */
/*
* Copyright (c) 2001 Kiyoshi Ikehara. All rights reserved.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.10 2009/05/12 08:44:19 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.11 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -59,15 +59,14 @@ struct slhci_isa_softc {
void *sc_ih;
};
static int slhci_isa_match(struct device *, cfdata_t, void *);
static void slhci_isa_attach(struct device *, struct device *, void *);
static int slhci_isa_match(device_t, cfdata_t, void *);
static void slhci_isa_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(slhci_isa, sizeof(struct slhci_isa_softc),
slhci_isa_match, slhci_isa_attach, NULL, slhci_activate);
static int
slhci_isa_match(struct device *parent, cfdata_t cf,
void *aux)
slhci_isa_match(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -90,7 +89,7 @@ slhci_isa_match(struct device *parent, cfdata_t cf,
}
static void
slhci_isa_attach(struct device *parent, struct device *self, void *aux)
slhci_isa_attach(device_t parent, device_t self, void *aux)
{
struct slhci_isa_softc *isc = device_private(self);
struct slhci_softc *sc = &isc->sc;

6
sys/dev/isa/smsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smsc.c,v 1.8 2008/04/28 20:23:52 martin Exp $ */
/* $NetBSD: smsc.c,v 1.9 2009/05/12 09:10:16 cegger Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: smsc.c,v 1.8 2008/04/28 20:23:52 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: smsc.c,v 1.9 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -249,7 +249,7 @@ smsc_attach(device_t parent, device_t self, void *aux)
}
static int
smsc_detach(struct device *self, int flags)
smsc_detach(device_t self, int flags)
{
struct smsc_softc *sc = device_private(self);

13
sys/dev/isa/tcic2_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcic2_isa.c,v 1.24 2009/05/12 08:44:20 cegger Exp $ */
/* $NetBSD: tcic2_isa.c,v 1.25 2009/05/12 09:10:16 cegger Exp $ */
/*
*
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.24 2009/05/12 08:44:20 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.25 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -108,8 +108,8 @@ int tcic_isa_debug = 1;
#define DPRINTF(arg)
#endif
int tcic_isa_probe(struct device *, cfdata_t, void *);
void tcic_isa_attach(struct device *, struct device *, void *);
int tcic_isa_probe(device_t, cfdata_t, void *);
void tcic_isa_attach(device_t, device_t, void *);
void *tcic_isa_chip_intr_establish(pcmcia_chipset_handle_t,
struct pcmcia_function *, int, int (*) (void *), void *);
@ -140,8 +140,7 @@ static const struct pcmcia_chip_functions tcic_isa_functions = {
};
int
tcic_isa_probe(struct device *parent, cfdata_t match,
void *aux)
tcic_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -215,7 +214,7 @@ tcic_isa_probe(struct device *parent, cfdata_t match,
}
void
tcic_isa_attach(struct device *parent, struct device *self, void *aux)
tcic_isa_attach(device_t parent, device_t self, void *aux)
{
struct tcic_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;

12
sys/dev/isa/tcom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcom.c,v 1.18 2009/03/14 15:36:18 dsl Exp $ */
/* $NetBSD: tcom.c,v 1.19 2009/05/12 09:10:16 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.18 2009/03/14 15:36:18 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.19 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -103,15 +103,15 @@ struct tcom_softc {
bus_space_handle_t sc_statusioh;
};
int tcomprobe(struct device *, cfdata_t, void *);
void tcomattach(struct device *, device_t, void *);
int tcomprobe(device_t, cfdata_t, void *);
void tcomattach(device_t, device_t, void *);
int tcomintr(void *);
CFATTACH_DECL_NEW(tcom, sizeof(struct tcom_softc),
tcomprobe, tcomattach, NULL, NULL);
int
tcomprobe(struct device *parent, cfdata_t self, void *aux)
tcomprobe(device_t parent, cfdata_t self, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -180,7 +180,7 @@ out:
}
void
tcomattach(struct device *parent, device_t self, void *aux)
tcomattach(device_t parent, device_t self, void *aux)
{
struct tcom_softc *sc = device_private(self);
struct isa_attach_args *ia = aux;

12
sys/dev/isa/toaster.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: toaster.c,v 1.9 2009/05/12 08:44:20 cegger Exp $ */
/* $NetBSD: toaster.c,v 1.10 2009/05/12 09:10:16 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.9 2009/05/12 08:44:20 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.10 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -63,8 +63,8 @@ struct toaster_softc {
callout_t led_callout[4];
};
static int toaster_match(struct device *, cfdata_t, void *);
static void toaster_attach(struct device *, struct device *, void *);
static int toaster_match(device_t, cfdata_t, void *);
static void toaster_attach(device_t, device_t, void *);
extern struct cfdriver toaster_cd;
@ -74,7 +74,7 @@ CFATTACH_DECL(toaster, sizeof(struct toaster_softc),
static struct toaster_softc *toaster_sc = NULL;
static int
toaster_match(struct device *parent, cfdata_t match, void *aux)
toaster_match(device_t parent, cfdata_t match, void *aux)
{
/* No more than one toaster per system */
if (toaster_sc == NULL)
@ -219,7 +219,7 @@ burner_sysctl(SYSCTLFN_ARGS)
static void
toaster_attach(struct device *parent, struct device *self, void *aux)
toaster_attach(device_t parent, device_t self, void *aux)
{
struct toaster_softc *sc = (void *)self;
struct tsdio_attach_args *taa = aux;

12
sys/dev/isa/toasterlcd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: toasterlcd.c,v 1.9 2009/05/12 08:44:20 cegger Exp $ */
/* $NetBSD: toasterlcd.c,v 1.10 2009/05/12 09:10:16 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.9 2009/05/12 08:44:20 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.10 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -62,8 +62,8 @@ struct toasterlcd_softc {
bus_space_handle_t sc_gpioh;
};
static int toasterlcd_match(struct device *, cfdata_t, void *);
static void toasterlcd_attach(struct device *, struct device *, void *);
static int toasterlcd_match(device_t, cfdata_t, void *);
static void toasterlcd_attach(device_t, device_t, void *);
static void toasterlcd_writereg(struct hd44780_chip *, u_int32_t, u_int32_t, u_int8_t);
static u_int8_t toasterlcd_readreg(struct hd44780_chip *, u_int32_t, u_int32_t);
@ -92,7 +92,7 @@ static const struct wsscreen_list toasterlcd_screenlist = {
};
static int
toasterlcd_match(struct device *parent, cfdata_t match, void *aux)
toasterlcd_match(device_t parent, cfdata_t match, void *aux)
{
return 1;
}
@ -110,7 +110,7 @@ toasterlcd_match(struct device *parent, cfdata_t match, void *aux)
(TSDIO_ ## x), TSDIO_GET(x) & (~(y)))
static void
toasterlcd_attach(struct device *parent, struct device *self, void *aux)
toasterlcd_attach(device_t parent, device_t self, void *aux)
{
struct toasterlcd_softc *sc = (void *)self;
struct tsdio_attach_args *taa = aux;

16
sys/dev/isa/tsdio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tsdio.c,v 1.9 2009/05/12 08:44:20 cegger Exp $ */
/* $NetBSD: tsdio.c,v 1.10 2009/05/12 09:10:16 cegger Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.9 2009/05/12 08:44:20 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.10 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -44,16 +44,16 @@ __KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.9 2009/05/12 08:44:20 cegger Exp $");
#include <dev/isa/isadmavar.h>
#include <dev/isa/tsdiovar.h>
int tsdio_probe(struct device *, cfdata_t, void *);
void tsdio_attach(struct device *, struct device *, void *);
int tsdio_search(struct device *, cfdata_t, const int *, void *);
int tsdio_probe(device_t, cfdata_t, void *);
void tsdio_attach(device_t, device_t, void *);
int tsdio_search(device_t, cfdata_t, const int *, void *);
int tsdio_print(void *, const char *);
CFATTACH_DECL(tsdio, sizeof(struct tsdio_softc),
tsdio_probe, tsdio_attach, NULL, NULL);
int
tsdio_probe(struct device *parent, cfdata_t cf, void *aux)
tsdio_probe(device_t parent, cfdata_t cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -101,7 +101,7 @@ tsdio_probe(struct device *parent, cfdata_t cf, void *aux)
}
void
tsdio_attach(struct device *parent, struct device *self, void *aux)
tsdio_attach(device_t parent, device_t self, void *aux)
{
struct tsdio_softc *sc = (struct tsdio_softc *) self;
struct isa_attach_args *ia = aux;
@ -126,7 +126,7 @@ tsdio_attach(struct device *parent, struct device *self, void *aux)
}
int
tsdio_search(struct device *parent, cfdata_t cf, const int *l, void *aux)
tsdio_search(device_t parent, cfdata_t cf, const int *l, void *aux)
{
struct tsdio_softc *sc = (struct tsdio_softc *)parent;
struct tsdio_attach_args sa;

13
sys/dev/isa/uha_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uha_isa.c,v 1.36 2009/05/12 08:44:20 cegger Exp $ */
/* $NetBSD: uha_isa.c,v 1.37 2009/05/12 09:10:16 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.36 2009/05/12 08:44:20 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.37 2009/05/12 09:10:16 cegger Exp $");
#include "opt_ddb.h"
@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.36 2009/05/12 08:44:20 cegger Exp $");
#define UHA_ISA_IOSIZE 16
int uha_isa_probe(struct device *, cfdata_t, void *);
void uha_isa_attach(struct device *, struct device *, void *);
int uha_isa_probe(device_t, cfdata_t, void *);
void uha_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(uha_isa, sizeof(struct uha_softc),
uha_isa_probe, uha_isa_attach, NULL, NULL);
@ -78,8 +78,7 @@ void u14_init(struct uha_softc *);
* the actual probe routine to check it out.
*/
int
uha_isa_probe(struct device *parent, cfdata_t match,
void *aux)
uha_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -134,7 +133,7 @@ uha_isa_probe(struct device *parent, cfdata_t match,
* Attach all the sub-devices we can find
*/
void
uha_isa_attach(struct device *parent, struct device *self, void *aux)
uha_isa_attach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
struct uha_softc *sc = (void *)self;

13
sys/dev/isa/wds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wds.c,v 1.72 2009/05/12 08:44:20 cegger Exp $ */
/* $NetBSD: wds.c,v 1.73 2009/05/12 09:10:16 cegger Exp $ */
/*
* XXX
@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.72 2009/05/12 08:44:20 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.73 2009/05/12 09:10:16 cegger Exp $");
#include "opt_ddb.h"
@ -199,8 +199,8 @@ int wds_ipoll(struct wds_softc *, struct wds_scb *, int);
void wds_timeout(void *);
int wds_create_scbs(struct wds_softc *, void *, size_t);
int wdsprobe(struct device *, cfdata_t, void *);
void wdsattach(struct device *, struct device *, void *);
int wdsprobe(device_t, cfdata_t, void *);
void wdsattach(device_t, device_t, void *);
CFATTACH_DECL(wds, sizeof(struct wds_softc),
wdsprobe, wdsattach, NULL, NULL);
@ -244,8 +244,7 @@ wds_cmd(bus_space_tag_t iot, bus_space_handle_t ioh, u_char *ibuf, int icnt)
* Check for the presence of a WD7000 SCSI controller.
*/
int
wdsprobe(struct device *parent, cfdata_t match,
void *aux)
wdsprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -309,7 +308,7 @@ wdsprobe(struct device *parent, cfdata_t match,
* Attach all available units.
*/
void
wdsattach(struct device *parent, struct device *self, void *aux)
wdsattach(device_t parent, device_t self, void *aux)
{
struct isa_attach_args *ia = aux;
struct wds_softc *sc = (void *)self;

4
sys/dev/isa/weaselvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: weaselvar.h,v 1.2 2001/12/16 22:30:27 thorpej Exp $ */
/* $NetBSD: weaselvar.h,v 1.3 2009/05/12 09:10:16 cegger Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@ -41,7 +41,7 @@
#include <dev/sysmon/sysmonvar.h>
struct weasel_handle {
struct device *wh_parent; /* backpointer to parent */
device_t wh_parent; /* backpointer to parent */
bus_space_tag_t wh_st;
bus_space_handle_t wh_sh;

16
sys/dev/isa/wss_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wss_isa.c,v 1.26 2009/05/12 08:44:20 cegger Exp $ */
/* $NetBSD: wss_isa.c,v 1.27 2009/05/12 09:10:16 cegger Exp $ */
/*
* Copyright (c) 1994 John Brezak
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.26 2009/05/12 08:44:20 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.27 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,15 +71,15 @@ extern int wssdebug;
#define DPRINTF(x)
#endif
static int wssfind(struct device *, struct wss_softc *, int,
static int wssfind(device_t, struct wss_softc *, int,
struct isa_attach_args *);
static void madprobe(struct wss_softc *, int);
static void madunmap(struct wss_softc *);
static int detect_mad16(struct wss_softc *, int);
int wss_isa_probe(struct device *, cfdata_t, void *);
void wss_isa_attach(struct device *, struct device *, void *);
int wss_isa_probe(device_t, cfdata_t, void *);
void wss_isa_attach(device_t, device_t, void *);
CFATTACH_DECL(wss_isa, sizeof(struct wss_softc),
wss_isa_probe, wss_isa_attach, NULL, NULL);
@ -88,7 +88,7 @@ CFATTACH_DECL(wss_isa, sizeof(struct wss_softc),
* Probe for the Microsoft Sound System hardware.
*/
int
wss_isa_probe(struct device *parent, cfdata_t match, void *aux)
wss_isa_probe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia;
struct wss_softc probesc, *sc;
@ -120,7 +120,7 @@ wss_isa_probe(struct device *parent, cfdata_t match, void *aux)
}
static int
wssfind(struct device *parent, struct wss_softc *sc, int probing,
wssfind(device_t parent, struct wss_softc *sc, int probing,
struct isa_attach_args *ia)
{
static u_char interrupt_bits[12] = {
@ -232,7 +232,7 @@ bad1:
* pseudo-device driver .
*/
void
wss_isa_attach(struct device *parent, struct device *self, void *aux)
wss_isa_attach(device_t parent, device_t self, void *aux)
{
struct wss_softc *sc;
struct ad1848_softc *ac;

13
sys/dev/isa/wt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wt.c,v 1.81 2009/05/12 08:44:20 cegger Exp $ */
/* $NetBSD: wt.c,v 1.82 2009/05/12 09:10:16 cegger Exp $ */
/*
* Streamer tape driver.
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.81 2009/05/12 08:44:20 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.82 2009/05/12 09:10:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -181,8 +181,8 @@ static int wtwritefm(struct wt_softc *sc);
static u_char wtsoft(struct wt_softc *sc, int mask, int bits);
static int wtintr(void *sc);
int wtprobe(struct device *, cfdata_t, void *);
void wtattach(struct device *, struct device *, void *);
int wtprobe(device_t, cfdata_t, void *);
void wtattach(device_t, device_t, void *);
CFATTACH_DECL(wt, sizeof(struct wt_softc),
wtprobe, wtattach, NULL, NULL);
@ -193,8 +193,7 @@ extern struct cfdriver wt_cd;
* Probe for the presence of the device.
*/
int
wtprobe(struct device *parent, cfdata_t match,
void *aux)
wtprobe(device_t parent, cfdata_t match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@ -258,7 +257,7 @@ done:
* Device is found, configure it.
*/
void
wtattach(struct device *parent, struct device *self, void *aux)
wtattach(device_t parent, device_t self, void *aux)
{
struct wt_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;

6
sys/dev/isa/ymvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ymvar.h,v 1.11 2008/04/28 20:23:52 martin Exp $ */
/* $NetBSD: ymvar.h,v 1.12 2009/05/12 09:10:16 cegger Exp $ */
/*-
* Copyright (c) 1999-2000, 2002 The NetBSD Foundation, Inc.
@ -184,11 +184,11 @@ struct ym_softc {
#define YM_EQ_OFF(v) ((v)->left < YM_EQ_ON_MIN && (v)->right < YM_EQ_ON_MIN)
#define YM_WIDE_OFF(v) ((v)->left < YM_3D_ON_MIN && (v)->right < YM_3D_ON_MIN)
struct device *sc_audiodev;
device_t sc_audiodev;
#if NMPU_YM > 0
bus_space_handle_t sc_mpu_ioh;
struct device *sc_mpudev;
device_t sc_mpudev;
#endif
#ifndef AUDIO_NO_POWER_CTL