Module Name: src
Committed By: cegger
Date: Tue May 12 14:23:47 UTC 2009
Modified Files:
src/sys/dev/i2o: dpti.c iop.c iopsp.c iopvar.h
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/i2o/dpti.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/i2o/iop.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/i2o/iopsp.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/i2o/iopvar.h
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/i2o/dpti.c
diff -u src/sys/dev/i2o/dpti.c:1.41 src/sys/dev/i2o/dpti.c:1.42
--- src/sys/dev/i2o/dpti.c:1.41 Tue May 12 12:14:18 2009
+++ src/sys/dev/i2o/dpti.c Tue May 12 14:23:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.41 2009/05/12 12:14:18 cegger Exp $ */
+/* $NetBSD: dpti.c,v 1.42 2009/05/12 14:23:47 cegger Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.41 2009/05/12 12:14:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.42 2009/05/12 14:23:47 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,10 +128,10 @@
"" /* Will be filled later */
};
-void dpti_attach(struct device *, struct device *, void *);
+void dpti_attach(device_t, device_t, void *);
int dpti_blinkled(struct dpti_softc *);
int dpti_ctlrinfo(struct dpti_softc *, int, void *);
-int dpti_match(struct device *, cfdata_t, void *);
+int dpti_match(device_t, cfdata_t, void *);
int dpti_passthrough(struct dpti_softc *, void *, struct proc *);
int dpti_sysinfo(struct dpti_softc *, int, void *);
@@ -149,7 +149,7 @@
dpti_match, dpti_attach, NULL, NULL);
int
-dpti_match(struct device *parent, cfdata_t match, void *aux)
+dpti_match(device_t parent, cfdata_t match, void *aux)
{
struct iop_attach_args *ia;
struct iop_softc *iop;
@@ -167,7 +167,7 @@
}
void
-dpti_attach(struct device *parent, struct device *self, void *aux)
+dpti_attach(device_t parent, device_t self, void *aux)
{
struct iop_softc *iop;
struct dpti_softc *sc;
Index: src/sys/dev/i2o/iop.c
diff -u src/sys/dev/i2o/iop.c:1.75 src/sys/dev/i2o/iop.c:1.76
--- src/sys/dev/i2o/iop.c:1.75 Sun Sep 14 18:12:16 2008
+++ src/sys/dev/i2o/iop.c Tue May 12 14:23:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.75 2008/09/14 18:12:16 mhitch Exp $ */
+/* $NetBSD: iop.c,v 1.76 2009/05/12 14:23:47 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.75 2008/09/14 18:12:16 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.76 2009/05/12 14:23:47 cegger Exp $");
#include "iop.h"
@@ -203,7 +203,7 @@
static inline u_int32_t iop_inl_msg(struct iop_softc *, int);
static inline void iop_outl_msg(struct iop_softc *, int, u_int32_t);
-static void iop_config_interrupts(struct device *);
+static void iop_config_interrupts(device_t);
static void iop_configure_devices(struct iop_softc *, int, int);
static void iop_devinfo(int, char *, size_t);
static int iop_print(void *, const char *);
@@ -213,7 +213,7 @@
static int iop_handle_reply(struct iop_softc *, u_int32_t);
static int iop_hrt_get(struct iop_softc *);
static int iop_hrt_get0(struct iop_softc *, struct i2o_hrt *, int);
-static void iop_intr_event(struct device *, struct iop_msg *, void *);
+static void iop_intr_event(device_t, struct iop_msg *, void *);
static int iop_lct_get0(struct iop_softc *, struct i2o_lct *, int,
u_int32_t);
static void iop_msg_poll(struct iop_softc *, struct iop_msg *, int);
@@ -417,7 +417,7 @@
* Defer further configuration until (a) interrupts are working and
* (b) we have enough information to build the system table.
*/
- config_interrupts((struct device *)sc, iop_config_interrupts);
+ config_interrupts((device_t)sc, iop_config_interrupts);
/* Configure shutdown hook before we start any device activity. */
if (iop_sdh == NULL)
@@ -461,7 +461,7 @@
* Perform autoconfiguration tasks.
*/
static void
-iop_config_interrupts(struct device *self)
+iop_config_interrupts(device_t self)
{
struct iop_attach_args ia;
struct iop_softc *sc, *iop;
@@ -770,7 +770,7 @@
struct iop_attach_args ia;
struct iop_initiator *ii;
const struct i2o_lct_entry *le;
- struct device *dv;
+ device_t dv;
int i, j, nent;
u_int usertid;
int locs[IOPCF_NLOCS];
@@ -1803,7 +1803,7 @@
* Handle an event signalled by the executive.
*/
static void
-iop_intr_event(struct device *dv, struct iop_msg *im, void *reply)
+iop_intr_event(device_t dv, struct iop_msg *im, void *reply)
{
struct i2o_util_event_register_reply *rb;
u_int event;
Index: src/sys/dev/i2o/iopsp.c
diff -u src/sys/dev/i2o/iopsp.c:1.34 src/sys/dev/i2o/iopsp.c:1.35
--- src/sys/dev/i2o/iopsp.c:1.34 Tue May 12 12:14:18 2009
+++ src/sys/dev/i2o/iopsp.c Tue May 12 14:23:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: iopsp.c,v 1.34 2009/05/12 12:14:18 cegger Exp $ */
+/* $NetBSD: iopsp.c,v 1.35 2009/05/12 14:23:47 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.34 2009/05/12 12:14:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.35 2009/05/12 14:23:47 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,14 +62,14 @@
#include <dev/i2o/iopvar.h>
#include <dev/i2o/iopspvar.h>
-static void iopsp_adjqparam(struct device *, int);
-static void iopsp_attach(struct device *, struct device *, void *);
-static void iopsp_intr(struct device *, struct iop_msg *, void *);
+static void iopsp_adjqparam(device_t, int);
+static void iopsp_attach(device_t, device_t, void *);
+static void iopsp_intr(device_t, struct iop_msg *, void *);
static int iopsp_ioctl(struct scsipi_channel *, u_long,
void *, int, struct proc *);
-static int iopsp_match(struct device *, cfdata_t, void *);
+static int iopsp_match(device_t, cfdata_t, void *);
static int iopsp_rescan(struct iopsp_softc *);
-static int iopsp_reconfig(struct device *);
+static int iopsp_reconfig(device_t);
static void iopsp_scsipi_request(struct scsipi_channel *,
scsipi_adapter_req_t, void *);
@@ -80,7 +80,7 @@
* Match a supported device.
*/
static int
-iopsp_match(struct device *parent, cfdata_t match, void *aux)
+iopsp_match(device_t parent, cfdata_t match, void *aux)
{
struct iop_attach_args *ia;
struct {
@@ -106,7 +106,7 @@
* Attach a supported device.
*/
static void
-iopsp_attach(struct device *parent, struct device *self, void *aux)
+iopsp_attach(device_t parent, device_t self, void *aux)
{
struct iop_attach_args *ia;
struct iopsp_softc *sc;
@@ -209,7 +209,7 @@
* the maps.
*/
static int
-iopsp_reconfig(struct device *dv)
+iopsp_reconfig(device_t dv)
{
struct iopsp_softc *sc;
struct iop_softc *iop;
@@ -526,7 +526,7 @@
* deal with it.
*/
static void
-iopsp_intr(struct device *dv, struct iop_msg *im, void *reply)
+iopsp_intr(device_t dv, struct iop_msg *im, void *reply)
{
struct scsipi_xfer *xs;
struct iopsp_softc *sc;
@@ -634,7 +634,7 @@
* The number of openings available to us has changed, so inform scsipi.
*/
static void
-iopsp_adjqparam(struct device *dv, int mpi)
+iopsp_adjqparam(device_t dv, int mpi)
{
struct iopsp_softc *sc;
struct iop_softc *iop;
Index: src/sys/dev/i2o/iopvar.h
diff -u src/sys/dev/i2o/iopvar.h:1.22 src/sys/dev/i2o/iopvar.h:1.23
--- src/sys/dev/i2o/iopvar.h:1.22 Mon Sep 8 23:36:54 2008
+++ src/sys/dev/i2o/iopvar.h Tue May 12 14:23:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: iopvar.h,v 1.22 2008/09/08 23:36:54 gmcgarry Exp $ */
+/* $NetBSD: iopvar.h,v 1.23 2009/05/12 14:23:47 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -76,9 +76,9 @@
LIST_ENTRY(iop_initiator) ii_list;
LIST_ENTRY(iop_initiator) ii_hash;
- void (*ii_intr)(struct device *, struct iop_msg *, void *);
- int (*ii_reconfig)(struct device *);
- void (*ii_adjqparam)(struct device *, int);
+ void (*ii_intr)(device_t, struct iop_msg *, void *);
+ int (*ii_reconfig)(device_t);
+ void (*ii_adjqparam)(device_t, int);
struct device *ii_dv;
kcondvar_t ii_cv;
