Module Name: src
Committed By: cegger
Date: Tue May 12 14:31:00 UTC 2009
Modified Files:
src/sys/dev/mca: aha_mca.c ed_mca.c edc_mca.c if_elmc_mca.c if_tr_mca.c
if_tra_mca.c mca.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/mca/aha_mca.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/mca/ed_mca.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mca/edc_mca.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mca/if_elmc_mca.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mca/if_tr_mca.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/mca/if_tra_mca.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/mca/mca.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/mca/aha_mca.c
diff -u src/sys/dev/mca/aha_mca.c:1.19 src/sys/dev/mca/aha_mca.c:1.20
--- src/sys/dev/mca/aha_mca.c:1.19 Tue May 12 13:15:24 2009
+++ src/sys/dev/mca/aha_mca.c Tue May 12 14:31:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_mca.c,v 1.19 2009/05/12 13:15:24 cegger Exp $ */
+/* $NetBSD: aha_mca.c,v 1.20 2009/05/12 14:31:00 cegger Exp $ */
/*
* Copyright (c) 2000-2002 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.19 2009/05/12 13:15:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.20 2009/05/12 14:31:00 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,14 +77,14 @@
#define AHA_ISA_IOSIZE 4
-int aha_mca_probe(struct device *, cfdata_t, void *);
-void aha_mca_attach(struct device *, struct device *, void *);
+int aha_mca_probe(device_t, cfdata_t, void *);
+void aha_mca_attach(device_t, device_t, void *);
CFATTACH_DECL(aha_mca, sizeof(struct aha_softc),
aha_mca_probe, aha_mca_attach, NULL, NULL);
int
-aha_mca_probe(struct device *parent, cfdata_t match,
+aha_mca_probe(device_t parent, cfdata_t match,
void *aux)
{
register struct mca_attach_args *ma = aux;
@@ -97,7 +97,7 @@
void
-aha_mca_attach(struct device *parent, struct device *self, void *aux)
+aha_mca_attach(device_t parent, device_t self, void *aux)
{
struct mca_attach_args *ma = aux;
struct aha_softc *sc = device_private(self);
Index: src/sys/dev/mca/ed_mca.c
diff -u src/sys/dev/mca/ed_mca.c:1.46 src/sys/dev/mca/ed_mca.c:1.47
--- src/sys/dev/mca/ed_mca.c:1.46 Tue May 12 13:15:24 2009
+++ src/sys/dev/mca/ed_mca.c Tue May 12 14:31:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.46 2009/05/12 13:15:24 cegger Exp $ */
+/* $NetBSD: ed_mca.c,v 1.47 2009/05/12 14:31:00 cegger Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.46 2009/05/12 13:15:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.47 2009/05/12 14:31:00 cegger Exp $");
#include "rnd.h"
@@ -78,8 +78,8 @@
#define EDLABELDEV(dev) (MAKEDISKDEV(major(dev), DISKUNIT(dev), RAW_PART))
-static int ed_mca_probe (struct device *, cfdata_t, void *);
-static void ed_mca_attach (struct device *, struct device *, void *);
+static int ed_mca_probe (device_t, cfdata_t, void *);
+static void ed_mca_attach (device_t, device_t, void *);
CFATTACH_DECL(ed_mca, sizeof(struct ed_softc),
ed_mca_probe, ed_mca_attach, NULL, NULL);
@@ -115,7 +115,7 @@
* Just check if it's possible to identify the disk.
*/
static int
-ed_mca_probe(struct device *parent, cfdata_t cf,
+ed_mca_probe(device_t parent, cfdata_t cf,
void *aux)
{
u_int16_t cmd_args[2];
@@ -135,7 +135,7 @@
}
static void
-ed_mca_attach(struct device *parent, struct device *self, void *aux)
+ed_mca_attach(device_t parent, device_t self, void *aux)
{
struct ed_softc *ed = device_private(self);
struct edc_mca_softc *sc = device_private(parent);
Index: src/sys/dev/mca/edc_mca.c
diff -u src/sys/dev/mca/edc_mca.c:1.43 src/sys/dev/mca/edc_mca.c:1.44
--- src/sys/dev/mca/edc_mca.c:1.43 Tue May 12 13:15:24 2009
+++ src/sys/dev/mca/edc_mca.c Tue May 12 14:31:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.43 2009/05/12 13:15:24 cegger Exp $ */
+/* $NetBSD: edc_mca.c,v 1.44 2009/05/12 14:31:00 cegger Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.43 2009/05/12 13:15:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.44 2009/05/12 14:31:00 cegger Exp $");
#include "rnd.h"
@@ -116,8 +116,8 @@
u_int16_t status_block[EDC_MAX_CMD_RES_LEN];
};
-int edc_mca_probe(struct device *, cfdata_t, void *);
-void edc_mca_attach(struct device *, struct device *, void *);
+int edc_mca_probe(device_t, cfdata_t, void *);
+void edc_mca_attach(device_t, device_t, void *);
CFATTACH_DECL(edc_mca, sizeof(struct edc_mca_softc),
edc_mca_probe, edc_mca_attach, NULL, NULL);
@@ -130,7 +130,7 @@
static void edcworker(void *);
int
-edc_mca_probe(struct device *parent, cfdata_t match,
+edc_mca_probe(device_t parent, cfdata_t match,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -145,7 +145,7 @@
}
void
-edc_mca_attach(struct device *parent, struct device *self, void *aux)
+edc_mca_attach(device_t parent, device_t self, void *aux)
{
struct edc_mca_softc *sc = device_private(self);
struct mca_attach_args *ma = aux;
Index: src/sys/dev/mca/if_elmc_mca.c
diff -u src/sys/dev/mca/if_elmc_mca.c:1.28 src/sys/dev/mca/if_elmc_mca.c:1.29
--- src/sys/dev/mca/if_elmc_mca.c:1.28 Tue May 12 13:15:24 2009
+++ src/sys/dev/mca/if_elmc_mca.c Tue May 12 14:31:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_elmc_mca.c,v 1.28 2009/05/12 13:15:24 cegger Exp $ */
+/* $NetBSD: if_elmc_mca.c,v 1.29 2009/05/12 14:31:00 cegger Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.28 2009/05/12 13:15:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.29 2009/05/12 14:31:00 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,8 +72,8 @@
void *sc_ih; /* interrupt handle */
};
-int elmc_mca_match(struct device *, cfdata_t, void *);
-void elmc_mca_attach(struct device *, struct device *, void *);
+int elmc_mca_match(device_t, cfdata_t, void *);
+void elmc_mca_attach(device_t, device_t, void *);
static void elmc_mca_copyin(struct ie_softc *, void *, int, size_t);
static void elmc_mca_copyout(struct ie_softc *, const void *, int, size_t);
@@ -85,7 +85,7 @@
static int elmc_mca_intrhook(struct ie_softc *, int);
int
-elmc_mca_match(struct device *parent, cfdata_t cf,
+elmc_mca_match(device_t parent, cfdata_t cf,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -99,7 +99,7 @@
}
void
-elmc_mca_attach(struct device *parent, struct device *self, void *aux)
+elmc_mca_attach(device_t parent, device_t self, void *aux)
{
struct elmc_mca_softc *asc = device_private(self);
struct ie_softc *sc = &asc->sc_ie;
Index: src/sys/dev/mca/if_tr_mca.c
diff -u src/sys/dev/mca/if_tr_mca.c:1.20 src/sys/dev/mca/if_tr_mca.c:1.21
--- src/sys/dev/mca/if_tr_mca.c:1.20 Tue May 12 13:15:24 2009
+++ src/sys/dev/mca/if_tr_mca.c Tue May 12 14:31:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_mca.c,v 1.20 2009/05/12 13:15:24 cegger Exp $ */
+/* $NetBSD: if_tr_mca.c,v 1.21 2009/05/12 14:31:00 cegger Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.20 2009/05/12 13:15:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.21 2009/05/12 14:31:00 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,8 +61,8 @@
#define TR_MBPS_4 0
#define TR_MBPS_16 1
-int tr_mca_probe(struct device *, cfdata_t, void *);
-void tr_mca_attach(struct device *, struct device *, void *);
+int tr_mca_probe(device_t, cfdata_t, void *);
+void tr_mca_attach(device_t, device_t, void *);
CFATTACH_DECL(tr_mca, sizeof(struct tr_softc),
tr_mca_probe, tr_mca_attach, NULL, NULL);
@@ -91,7 +91,7 @@
}
int
-tr_mca_probe(struct device *parent, cfdata_t match,
+tr_mca_probe(device_t parent, cfdata_t match,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -104,7 +104,7 @@
void
-tr_mca_attach(struct device *parent, struct device *self, void *aux)
+tr_mca_attach(device_t parent, device_t self, void *aux)
{
struct tr_softc *sc = device_private(self);
struct mca_attach_args *ma = aux;
Index: src/sys/dev/mca/if_tra_mca.c
diff -u src/sys/dev/mca/if_tra_mca.c:1.13 src/sys/dev/mca/if_tra_mca.c:1.14
--- src/sys/dev/mca/if_tra_mca.c:1.13 Tue May 12 13:15:24 2009
+++ src/sys/dev/mca/if_tra_mca.c Tue May 12 14:31:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tra_mca.c,v 1.13 2009/05/12 13:15:24 cegger Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.14 2009/05/12 14:31:00 cegger Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.13 2009/05/12 13:15:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.14 2009/05/12 14:31:00 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,8 +56,8 @@
#include <dev/mca/mcavar.h>
#include <dev/mca/mcadevs.h>
-int tiara_mca_match(struct device *, cfdata_t, void *);
-void tiara_mca_attach(struct device *, struct device *, void *);
+int tiara_mca_match(device_t, cfdata_t, void *);
+void tiara_mca_attach(device_t, device_t, void *);
#define TIARA_NPORTS 0x20 /* 32 */
#define TIARA_PROM_ID 24 /* offset to mac addr stored in prom */
@@ -97,7 +97,7 @@
}
int
-tiara_mca_match(struct device *parent, cfdata_t match,
+tiara_mca_match(device_t parent, cfdata_t match,
void *aux)
{
struct mca_attach_args *ma = (struct mca_attach_args *) aux;
@@ -120,7 +120,7 @@
};
void
-tiara_mca_attach(struct device *parent, struct device *self, void *aux)
+tiara_mca_attach(device_t parent, device_t self, void *aux)
{
struct tiara_softc *isc = device_private(self);
struct mb86950_softc *sc = &isc->sc_mb86950;
Index: src/sys/dev/mca/mca.c
diff -u src/sys/dev/mca/mca.c:1.29 src/sys/dev/mca/mca.c:1.30
--- src/sys/dev/mca/mca.c:1.29 Tue May 12 13:15:24 2009
+++ src/sys/dev/mca/mca.c Tue May 12 14:31:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.29 2009/05/12 13:15:24 cegger Exp $ */
+/* $NetBSD: mca.c,v 1.30 2009/05/12 14:31:00 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.29 2009/05/12 13:15:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.30 2009/05/12 14:31:00 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,8 +50,8 @@
#include "locators.h"
-int mca_match(struct device *, cfdata_t, void *);
-void mca_attach(struct device *, struct device *, void *);
+int mca_match(device_t, cfdata_t, void *);
+void mca_attach(device_t, device_t, void *);
CFATTACH_DECL(mca, sizeof(struct device),
mca_match, mca_attach, NULL, NULL);
@@ -59,7 +59,7 @@
int mca_print(void *, const char *);
int
-mca_match(struct device *parent, cfdata_t cf, void *aux)
+mca_match(device_t parent, cfdata_t cf, void *aux)
{
struct mcabus_attach_args *mba = aux;
@@ -105,7 +105,7 @@
}
void
-mca_attach(struct device *parent, struct device *self, void *aux)
+mca_attach(device_t parent, device_t self, void *aux)
{
struct mcabus_attach_args *mba = aux;
bus_space_tag_t iot, memt;
