Module Name: src
Committed By: cegger
Date: Tue May 12 14:47:05 UTC 2009
Modified Files:
src/sys/dev/tc: bba.c if_fta.c ioasicvar.h px.c pxg.c tc.c tcdsvar.h
tcvar.h xcfb.c zskbd.c zsms.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/tc/bba.c src/sys/dev/tc/px.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/tc/if_fta.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/tc/ioasicvar.h
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/tc/pxg.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/tc/tc.c src/sys/dev/tc/xcfb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/tc/tcdsvar.h
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/tc/tcvar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/tc/zskbd.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/tc/zsms.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/tc/bba.c
diff -u src/sys/dev/tc/bba.c:1.35 src/sys/dev/tc/bba.c:1.36
--- src/sys/dev/tc/bba.c:1.35 Tue May 12 13:21:22 2009
+++ src/sys/dev/tc/bba.c Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bba.c,v 1.35 2009/05/12 13:21:22 cegger Exp $ */
+/* $NetBSD: bba.c,v 1.36 2009/05/12 14:47:04 cegger Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
/* maxine/alpha baseboard audio (bba) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.35 2009/05/12 13:21:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.36 2009/05/12 14:47:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,8 +92,8 @@
struct bba_dma_state sc_rx_dma_state;
};
-static int bba_match(struct device *, cfdata_t, void *);
-static void bba_attach(struct device *, struct device *, void *);
+static int bba_match(device_t, cfdata_t, void *);
+static void bba_attach(device_t, device_t, void *);
CFATTACH_DECL(bba, sizeof(struct bba_softc),
bba_match, bba_attach, NULL, NULL);
@@ -190,7 +190,7 @@
static uint8_t bba_codec_dread(struct am7930_softc *, int);
static int
-bba_match(struct device *parent, cfdata_t cf, void *aux)
+bba_match(device_t parent, cfdata_t cf, void *aux)
{
struct ioasicdev_attach_args *ia;
@@ -204,7 +204,7 @@
static void
-bba_attach(struct device *parent, struct device *self, void *aux)
+bba_attach(device_t parent, device_t self, void *aux)
{
struct ioasicdev_attach_args *ia;
struct bba_softc *sc;
Index: src/sys/dev/tc/px.c
diff -u src/sys/dev/tc/px.c:1.35 src/sys/dev/tc/px.c:1.36
--- src/sys/dev/tc/px.c:1.35 Tue May 12 13:21:22 2009
+++ src/sys/dev/tc/px.c Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: px.c,v 1.35 2009/05/12 13:21:22 cegger Exp $ */
+/* $NetBSD: px.c,v 1.36 2009/05/12 14:47:04 cegger Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.35 2009/05/12 13:21:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.36 2009/05/12 14:47:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,11 +90,11 @@
#define PXF_QUEUE 0x01
-static void px_attach(struct device *, struct device *, void *);
+static void px_attach(device_t, device_t, void *);
static void px_init(struct stic_info *, int);
static int px_ioctl(struct stic_info *, u_long, void *, int,
struct lwp *);
-static int px_match(struct device *, cfdata_t, void *);
+static int px_match(device_t, cfdata_t, void *);
static int px_intr(void *);
static uint32_t *px_pbuf_get(struct stic_info *);
Index: src/sys/dev/tc/if_fta.c
diff -u src/sys/dev/tc/if_fta.c:1.26 src/sys/dev/tc/if_fta.c:1.27
--- src/sys/dev/tc/if_fta.c:1.26 Tue May 12 13:21:22 2009
+++ src/sys/dev/tc/if_fta.c Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fta.c,v 1.26 2009/05/12 13:21:22 cegger Exp $ */
+/* $NetBSD: if_fta.c,v 1.27 2009/05/12 14:47:04 cegger Exp $ */
/*-
* Copyright (c) 1996 Matt Thomas <[email protected]>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.26 2009/05/12 13:21:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.27 2009/05/12 14:47:04 cegger Exp $");
#include "opt_inet.h"
@@ -65,7 +65,7 @@
static int
pdq_tc_match(
- struct device *parent,
+ device_t parent,
cfdata_t match,
void *aux)
{
@@ -79,8 +79,8 @@
static void
pdq_tc_attach(
- struct device * const parent,
- struct device * const self,
+ device_t const parent,
+ device_t const self,
void *const aux)
{
pdq_softc_t * const sc = device_private(self);
Index: src/sys/dev/tc/ioasicvar.h
diff -u src/sys/dev/tc/ioasicvar.h:1.19 src/sys/dev/tc/ioasicvar.h:1.20
--- src/sys/dev/tc/ioasicvar.h:1.19 Sun Dec 11 12:24:00 2005
+++ src/sys/dev/tc/ioasicvar.h Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasicvar.h,v 1.19 2005/12/11 12:24:00 christos Exp $ */
+/* $NetBSD: ioasicvar.h,v 1.20 2009/05/12 14:47:04 cegger Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -60,10 +60,10 @@
*/
extern tc_addr_t ioasic_base;
-const struct evcnt *ioasic_intr_evcnt(struct device *, void *);
-void ioasic_intr_establish(struct device *, void *,
+const struct evcnt *ioasic_intr_evcnt(device_t, void *);
+void ioasic_intr_establish(device_t, void *,
int, int (*)(void *), void *);
-void ioasic_intr_disestablish(struct device *, void *);
+void ioasic_intr_disestablish(device_t, void *);
void ioasic_attach_devs(struct ioasic_softc *,
struct ioasic_dev *, int);
Index: src/sys/dev/tc/pxg.c
diff -u src/sys/dev/tc/pxg.c:1.31 src/sys/dev/tc/pxg.c:1.32
--- src/sys/dev/tc/pxg.c:1.31 Tue May 12 13:21:22 2009
+++ src/sys/dev/tc/pxg.c Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pxg.c,v 1.31 2009/05/12 13:21:22 cegger Exp $ */
+/* $NetBSD: pxg.c,v 1.32 2009/05/12 14:47:04 cegger Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.31 2009/05/12 13:21:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.32 2009/05/12 14:47:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,9 +80,9 @@
#define PXG_I860_START_OFFSET 0x380000 /* i860 start register */
#define PXG_I860_RESET_OFFSET 0x3c0000 /* i860 stop register */
-static void pxg_attach(struct device *, struct device *, void *);
+static void pxg_attach(device_t, device_t, void *);
static int pxg_intr(void *);
-static int pxg_match(struct device *, cfdata_t, void *);
+static int pxg_match(device_t, cfdata_t, void *);
static void pxg_init(struct stic_info *);
static int pxg_ioctl(struct stic_info *, u_long, void *, int, struct lwp *);
Index: src/sys/dev/tc/tc.c
diff -u src/sys/dev/tc/tc.c:1.49 src/sys/dev/tc/tc.c:1.50
--- src/sys/dev/tc/tc.c:1.49 Tue May 12 13:21:22 2009
+++ src/sys/dev/tc/tc.c Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tc.c,v 1.49 2009/05/12 13:21:22 cegger Exp $ */
+/* $NetBSD: tc.c,v 1.50 2009/05/12 14:47:04 cegger Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.49 2009/05/12 13:21:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.50 2009/05/12 14:47:04 cegger Exp $");
#include "opt_tcverbose.h"
@@ -45,7 +45,7 @@
#include "locators.h"
/* Definition of the driver for autoconfig. */
-static int tcmatch(struct device *, cfdata_t, void *);
+static int tcmatch(device_t, cfdata_t, void *);
CFATTACH_DECL(tc, sizeof(struct tc_softc),
tcmatch, tcattach, NULL, NULL);
@@ -56,7 +56,7 @@
static void tc_devinfo(const char *, char *, size_t);
static int
-tcmatch(struct device *parent, cfdata_t cf, void *aux)
+tcmatch(device_t parent, cfdata_t cf, void *aux)
{
struct tcbus_attach_args *tba = aux;
@@ -67,7 +67,7 @@
}
void
-tcattach(struct device *parent, struct device *self, void *aux)
+tcattach(device_t parent, device_t self, void *aux)
{
struct tc_softc *sc = device_private(self);
struct tcbus_attach_args *tba = aux;
@@ -243,7 +243,7 @@
}
const struct evcnt *
-tc_intr_evcnt(struct device *dev, void *cookie)
+tc_intr_evcnt(device_t dev, void *cookie)
{
struct tc_softc *sc = device_lookup_private(&tc_cd, 0);
@@ -251,7 +251,7 @@
}
void
-tc_intr_establish(struct device *dev, void *cookie, int level,
+tc_intr_establish(device_t dev, void *cookie, int level,
int (*handler)(void *), void *arg)
{
struct tc_softc *sc = device_lookup_private(&tc_cd, 0);
@@ -260,7 +260,7 @@
}
void
-tc_intr_disestablish(struct device *dev, void *cookie)
+tc_intr_disestablish(device_t dev, void *cookie)
{
struct tc_softc *sc = device_lookup_private(&tc_cd, 0);
Index: src/sys/dev/tc/xcfb.c
diff -u src/sys/dev/tc/xcfb.c:1.49 src/sys/dev/tc/xcfb.c:1.50
--- src/sys/dev/tc/xcfb.c:1.49 Tue May 12 13:21:22 2009
+++ src/sys/dev/tc/xcfb.c Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.49 2009/05/12 13:21:22 cegger Exp $ */
+/* $NetBSD: xcfb.c,v 1.50 2009/05/12 14:47:04 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.49 2009/05/12 13:21:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.50 2009/05/12 14:47:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,8 +94,8 @@
int sc_csr; /* software copy of IMS332 CSR A */
};
-static int xcfbmatch(struct device *, cfdata_t, void *);
-static void xcfbattach(struct device *, struct device *, void *);
+static int xcfbmatch(device_t, cfdata_t, void *);
+static void xcfbattach(device_t, device_t, void *);
CFATTACH_DECL_NEW(xcfb, sizeof(struct xcfb_softc),
xcfbmatch, xcfbattach, NULL, NULL);
Index: src/sys/dev/tc/tcdsvar.h
diff -u src/sys/dev/tc/tcdsvar.h:1.5 src/sys/dev/tc/tcdsvar.h:1.6
--- src/sys/dev/tc/tcdsvar.h:1.5 Sun Dec 11 12:24:00 2005
+++ src/sys/dev/tc/tcdsvar.h Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcdsvar.h,v 1.5 2005/12/11 12:24:00 christos Exp $ */
+/* $NetBSD: tcdsvar.h,v 1.6 2009/05/12 14:47:04 cegger Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -76,8 +76,8 @@
/*
* TCDS functions.
*/
-void tcds_intr_establish(struct device *, int, int (*)(void *), void *);
-void tcds_intr_disestablish(struct device *, int);
+void tcds_intr_establish(device_t, int, int (*)(void *), void *);
+void tcds_intr_disestablish(device_t, int);
void tcds_dma_enable(struct tcds_slotconfig *, int);
void tcds_scsi_enable(struct tcds_slotconfig *, int);
int tcds_scsi_iserr(struct tcds_slotconfig *);
Index: src/sys/dev/tc/tcvar.h
diff -u src/sys/dev/tc/tcvar.h:1.23 src/sys/dev/tc/tcvar.h:1.24
--- src/sys/dev/tc/tcvar.h:1.23 Fri Oct 19 12:01:20 2007
+++ src/sys/dev/tc/tcvar.h Tue May 12 14:47:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcvar.h,v 1.23 2007/10/19 12:01:20 ad Exp $ */
+/* $NetBSD: tcvar.h,v 1.24 2009/05/12 14:47:04 cegger Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -69,10 +69,10 @@
int sc_nslots;
struct tc_slotdesc *sc_slots;
- const struct evcnt *(*sc_intr_evcnt)(struct device *, void *);
- void (*sc_intr_establish)(struct device *, void *,
+ const struct evcnt *(*sc_intr_evcnt)(device_t, void *);
+ void (*sc_intr_establish)(device_t, void *,
int, int (*)(void *), void *);
- void (*sc_intr_disestablish)(struct device *, void *);
+ void (*sc_intr_disestablish)(device_t, void *);
bus_dma_tag_t (*sc_get_dma_tag)(int);
};
@@ -92,10 +92,10 @@
/* TC bus resource management; XXX will move elsewhere eventually. */
- const struct evcnt *(*tba_intr_evcnt)(struct device *, void *);
- void (*tba_intr_establish)(struct device *, void *,
+ const struct evcnt *(*tba_intr_evcnt)(device_t, void *);
+ void (*tba_intr_establish)(device_t, void *,
int, int (*)(void *), void *);
- void (*tba_intr_disestablish)(struct device *, void *);
+ void (*tba_intr_disestablish)(device_t, void *);
bus_dma_tag_t (*tba_get_dma_tag)(int);
};
@@ -139,11 +139,11 @@
* Interrupt establishment functions.
*/
int tc_checkslot(tc_addr_t, char *);
-void tcattach(struct device *, struct device *, void *);
-const struct evcnt *tc_intr_evcnt(struct device *, void *);
-void tc_intr_establish(struct device *, void *, int, int (*)(void *),
+void tcattach(device_t, device_t, void *);
+const struct evcnt *tc_intr_evcnt(device_t, void *);
+void tc_intr_establish(device_t, void *, int, int (*)(void *),
void *);
-void tc_intr_disestablish(struct device *, void *);
+void tc_intr_disestablish(device_t, void *);
/*
* Miscellaneous definitions.
Index: src/sys/dev/tc/zskbd.c
diff -u src/sys/dev/tc/zskbd.c:1.16 src/sys/dev/tc/zskbd.c:1.17
--- src/sys/dev/tc/zskbd.c:1.16 Sat Mar 29 19:15:36 2008
+++ src/sys/dev/tc/zskbd.c Tue May 12 14:47:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zskbd.c,v 1.16 2008/03/29 19:15:36 tsutsui Exp $ */
+/* $NetBSD: zskbd.c,v 1.17 2009/05/12 14:47:05 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.16 2008/03/29 19:15:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.17 2009/05/12 14:47:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,7 +113,7 @@
int sc_enabled;
int kbd_type;
- struct device *sc_wskbddev;
+ device_t sc_wskbddev;
};
static struct zsops zsops_zskbd;
Index: src/sys/dev/tc/zsms.c
diff -u src/sys/dev/tc/zsms.c:1.17 src/sys/dev/tc/zsms.c:1.18
--- src/sys/dev/tc/zsms.c:1.17 Sat Mar 29 19:15:36 2008
+++ src/sys/dev/tc/zsms.c Tue May 12 14:47:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zsms.c,v 1.17 2008/03/29 19:15:36 tsutsui Exp $ */
+/* $NetBSD: zsms.c,v 1.18 2009/05/12 14:47:05 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.17 2008/03/29 19:15:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.18 2009/05/12 14:47:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,7 +105,7 @@
u_int buttons;
int dx, dy;
- struct device *sc_wsmousedev;
+ device_t sc_wsmousedev;
};
static struct zsops zsops_zsms;
