Module Name: src
Committed By: cegger
Date: Tue May 12 14:21:32 UTC 2009
Modified Files:
src/sys/dev/eisa: ahb.c bha_eisa.c cac_eisa.c dpt_eisa.c if_fea.c
mlx_eisa.c uha_eisa.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/eisa/ahb.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/eisa/bha_eisa.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/eisa/cac_eisa.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/eisa/dpt_eisa.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/eisa/if_fea.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/eisa/mlx_eisa.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/eisa/uha_eisa.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/eisa/ahb.c
diff -u src/sys/dev/eisa/ahb.c:1.55 src/sys/dev/eisa/ahb.c:1.56
--- src/sys/dev/eisa/ahb.c:1.55 Tue May 12 12:12:52 2009
+++ src/sys/dev/eisa/ahb.c Tue May 12 14:21:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ahb.c,v 1.55 2009/05/12 12:12:52 cegger Exp $ */
+/* $NetBSD: ahb.c,v 1.56 2009/05/12 14:21:32 cegger Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.55 2009/05/12 12:12:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.56 2009/05/12 14:21:32 cegger Exp $");
#include "opt_ddb.h"
@@ -137,8 +137,8 @@
static int ahb_init_ecb(struct ahb_softc *, struct ahb_ecb *);
-static int ahbmatch(struct device *, cfdata_t, void *);
-static void ahbattach(struct device *, struct device *, void *);
+static int ahbmatch(device_t, cfdata_t, void *);
+static void ahbattach(device_t, device_t, void *);
CFATTACH_DECL(ahb, sizeof(struct ahb_softc),
ahbmatch, ahbattach, NULL, NULL);
@@ -151,7 +151,7 @@
* the actual probe routine to check it out.
*/
static int
-ahbmatch(struct device *parent, cfdata_t match,
+ahbmatch(device_t parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -182,7 +182,7 @@
* Attach all the sub-devices we can find
*/
static void
-ahbattach(struct device *parent, struct device *self, void *aux)
+ahbattach(device_t parent, device_t self, void *aux)
{
struct eisa_attach_args *ea = aux;
struct ahb_softc *sc = device_private(self);
Index: src/sys/dev/eisa/bha_eisa.c
diff -u src/sys/dev/eisa/bha_eisa.c:1.32 src/sys/dev/eisa/bha_eisa.c:1.33
--- src/sys/dev/eisa/bha_eisa.c:1.32 Tue May 12 12:12:52 2009
+++ src/sys/dev/eisa/bha_eisa.c Tue May 12 14:21:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_eisa.c,v 1.32 2009/05/12 12:12:52 cegger Exp $ */
+/* $NetBSD: bha_eisa.c,v 1.33 2009/05/12 14:21:32 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.32 2009/05/12 12:12:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.33 2009/05/12 14:21:32 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,8 @@
#define BHA_EISA_IOCONF 0x0c
static int bha_eisa_address(bus_space_tag_t, bus_space_handle_t, int *);
-static int bha_eisa_match(struct device *, cfdata_t, void *);
-static void bha_eisa_attach(struct device *, struct device *, void *);
+static int bha_eisa_match(device_t, cfdata_t, void *);
+static void bha_eisa_attach(device_t, device_t, void *);
CFATTACH_DECL(bha_eisa, sizeof(struct bha_softc),
bha_eisa_match, bha_eisa_attach, NULL, NULL);
@@ -99,7 +99,7 @@
* the actual probe routine to check it out.
*/
static int
-bha_eisa_match(struct device *parent, cfdata_t match,
+bha_eisa_match(device_t parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -136,7 +136,7 @@
* Attach all the sub-devices we can find
*/
static void
-bha_eisa_attach(struct device *parent, struct device *self, void *aux)
+bha_eisa_attach(device_t parent, device_t self, void *aux)
{
struct eisa_attach_args *ea = aux;
struct bha_softc *sc = device_private(self);
Index: src/sys/dev/eisa/cac_eisa.c
diff -u src/sys/dev/eisa/cac_eisa.c:1.20 src/sys/dev/eisa/cac_eisa.c:1.21
--- src/sys/dev/eisa/cac_eisa.c:1.20 Tue May 12 12:12:52 2009
+++ src/sys/dev/eisa/cac_eisa.c Tue May 12 14:21:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_eisa.c,v 1.20 2009/05/12 12:12:52 cegger Exp $ */
+/* $NetBSD: cac_eisa.c,v 1.21 2009/05/12 14:21:32 cegger Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.20 2009/05/12 12:12:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.21 2009/05/12 14:21:32 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,8 +80,8 @@
#define CAC_EISA_IOSIZE 0x0017
#define CAC_EISA_IOCONF 0x38
-static void cac_eisa_attach(struct device *, struct device *, void *);
-static int cac_eisa_match(struct device *, cfdata_t, void *);
+static void cac_eisa_attach(device_t, device_t, void *);
+static int cac_eisa_match(device_t, cfdata_t, void *);
static struct cac_ccb *cac_eisa_l0_completed(struct cac_softc *);
static int cac_eisa_l0_fifo_full(struct cac_softc *);
@@ -113,7 +113,7 @@
};
static int
-cac_eisa_match(struct device *parent, cfdata_t match,
+cac_eisa_match(device_t parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea;
@@ -129,7 +129,7 @@
}
static void
-cac_eisa_attach(struct device *parent, struct device *self, void *aux)
+cac_eisa_attach(device_t parent, device_t self, void *aux)
{
struct eisa_attach_args *ea;
bus_space_handle_t ioh;
Index: src/sys/dev/eisa/dpt_eisa.c
diff -u src/sys/dev/eisa/dpt_eisa.c:1.19 src/sys/dev/eisa/dpt_eisa.c:1.20
--- src/sys/dev/eisa/dpt_eisa.c:1.19 Tue May 12 12:12:52 2009
+++ src/sys/dev/eisa/dpt_eisa.c Tue May 12 14:21:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_eisa.c,v 1.19 2009/05/12 12:12:52 cegger Exp $ */
+/* $NetBSD: dpt_eisa.c,v 1.20 2009/05/12 14:21:32 cegger Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <a...@netbsd.org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.19 2009/05/12 12:12:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.20 2009/05/12 14:21:32 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,9 +57,9 @@
#define DPT_EISA_IOCONF 0x90
#define DPT_EISA_EATA_REG_OFFSET 0x88
-static void dpt_eisa_attach(struct device *, struct device *, void *);
+static void dpt_eisa_attach(device_t, device_t, void *);
static int dpt_eisa_irq(bus_space_tag_t, bus_space_handle_t, int *);
-static int dpt_eisa_match(struct device *, cfdata_t, void *);
+static int dpt_eisa_match(device_t, cfdata_t, void *);
CFATTACH_DECL(dpt_eisa, sizeof(struct dpt_softc),
dpt_eisa_match, dpt_eisa_attach, NULL, NULL);
@@ -103,7 +103,7 @@
}
static int
-dpt_eisa_match(struct device *parent, cfdata_t match,
+dpt_eisa_match(device_t parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea;
@@ -119,7 +119,7 @@
}
static void
-dpt_eisa_attach(struct device *parent, struct device *self, void *aux)
+dpt_eisa_attach(device_t parent, device_t self, void *aux)
{
struct eisa_attach_args *ea;
bus_space_handle_t ioh;
Index: src/sys/dev/eisa/if_fea.c
diff -u src/sys/dev/eisa/if_fea.c:1.40 src/sys/dev/eisa/if_fea.c:1.41
--- src/sys/dev/eisa/if_fea.c:1.40 Tue May 12 12:12:52 2009
+++ src/sys/dev/eisa/if_fea.c Tue May 12 14:21:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fea.c,v 1.40 2009/05/12 12:12:52 cegger Exp $ */
+/* $NetBSD: if_fea.c,v 1.41 2009/05/12 14:21:32 cegger Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <m...@3am-software.com>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.40 2009/05/12 12:12:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.41 2009/05/12 14:21:32 cegger Exp $");
#include "opt_inet.h"
@@ -332,7 +332,7 @@
#if defined(__bsdi__)
static int
pdq_eisa_probe(
- struct device *parent,
+ device_t parent,
cfdata_t cf,
void *aux)
{
@@ -389,8 +389,8 @@
static void
pdq_eisa_attach(
- struct device *parent,
- struct device *self,
+ device_t parent,
+ device_t self,
void *aux)
{
pdq_softc_t *sc = (pdq_softc_t *) self;
@@ -444,7 +444,7 @@
#if defined(__NetBSD__)
static int
pdq_eisa_match(
- struct device *parent,
+ device_t parent,
cfdata_t match,
void *aux)
{
@@ -458,8 +458,8 @@
static void
pdq_eisa_attach(
- struct device *parent,
- struct device *self,
+ device_t parent,
+ device_t self,
void *aux)
{
pdq_softc_t * const sc = device_private(self);
Index: src/sys/dev/eisa/mlx_eisa.c
diff -u src/sys/dev/eisa/mlx_eisa.c:1.21 src/sys/dev/eisa/mlx_eisa.c:1.22
--- src/sys/dev/eisa/mlx_eisa.c:1.21 Tue May 12 12:12:52 2009
+++ src/sys/dev/eisa/mlx_eisa.c Tue May 12 14:21:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_eisa.c,v 1.21 2009/05/12 12:12:52 cegger Exp $ */
+/* $NetBSD: mlx_eisa.c,v 1.22 2009/05/12 14:21:32 cegger Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.21 2009/05/12 12:12:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.22 2009/05/12 14:21:32 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,8 +63,8 @@
#define MLX_EISA_CFG09 (0x0c94 - MLX_EISA_SLOT_OFFSET)
#define MLX_EISA_CFG10 (0x0c95 - MLX_EISA_SLOT_OFFSET)
-static void mlx_eisa_attach(struct device *, struct device *, void *);
-static int mlx_eisa_match(struct device *, cfdata_t, void *);
+static void mlx_eisa_attach(device_t, device_t, void *);
+static int mlx_eisa_match(device_t, cfdata_t, void *);
static int mlx_v1_submit(struct mlx_softc *, struct mlx_ccb *);
static int mlx_v1_findcomplete(struct mlx_softc *, u_int *, u_int *);
@@ -92,7 +92,7 @@
};
static int
-mlx_eisa_match(struct device *parent, cfdata_t match,
+mlx_eisa_match(device_t parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea;
@@ -108,7 +108,7 @@
}
static void
-mlx_eisa_attach(struct device *parent, struct device *self, void *aux)
+mlx_eisa_attach(device_t parent, device_t self, void *aux)
{
struct eisa_attach_args *ea;
bus_space_handle_t ioh;
Index: src/sys/dev/eisa/uha_eisa.c
diff -u src/sys/dev/eisa/uha_eisa.c:1.30 src/sys/dev/eisa/uha_eisa.c:1.31
--- src/sys/dev/eisa/uha_eisa.c:1.30 Tue May 12 12:12:52 2009
+++ src/sys/dev/eisa/uha_eisa.c Tue May 12 14:21:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_eisa.c,v 1.30 2009/05/12 12:12:52 cegger Exp $ */
+/* $NetBSD: uha_eisa.c,v 1.31 2009/05/12 14:21:32 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.30 2009/05/12 12:12:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.31 2009/05/12 14:21:32 cegger Exp $");
#include "opt_ddb.h"
@@ -57,8 +57,8 @@
#define UHA_EISA_SLOT_OFFSET 0xc80
#define UHA_EISA_IOSIZE 0x020
-static int uha_eisa_match(struct device *, cfdata_t, void *);
-static void uha_eisa_attach(struct device *, struct device *, void *);
+static int uha_eisa_match(device_t, cfdata_t, void *);
+static void uha_eisa_attach(device_t, device_t, void *);
CFATTACH_DECL(uha_eisa, sizeof(struct uha_softc),
uha_eisa_match, uha_eisa_attach, NULL, NULL);
@@ -80,7 +80,7 @@
* the actual probe routine to check it out.
*/
static int
-uha_eisa_match(struct device *parent, cfdata_t match,
+uha_eisa_match(device_t parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -107,7 +107,7 @@
* Attach all the sub-devices we can find
*/
static void
-uha_eisa_attach(struct device *parent, struct device *self, void *aux)
+uha_eisa_attach(device_t parent, device_t self, void *aux)
{
struct eisa_attach_args *ea = aux;
struct uha_softc *sc = device_private(self);
