Module Name: src
Committed By: cegger
Date: Tue May 12 14:44:31 UTC 2009
Modified Files:
src/sys/dev/scsipi: ch.c if_se.c scsiconf.c scsipiconf.h sd.c ses.c
ss.c st.c st_atapi.c st_scsi.c stvar.h uk.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/scsipi/ch.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/scsipi/if_se.c src/sys/dev/scsipi/ss.c
cvs rdiff -u -r1.252 -r1.253 src/sys/dev/scsipi/scsiconf.c
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/scsipi/scsipiconf.h
cvs rdiff -u -r1.280 -r1.281 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/scsipi/ses.c
cvs rdiff -u -r1.210 -r1.211 src/sys/dev/scsipi/st.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/scsipi/st_atapi.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/scsipi/st_scsi.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/scsipi/stvar.h
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/scsipi/uk.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/scsipi/ch.c
diff -u src/sys/dev/scsipi/ch.c:1.83 src/sys/dev/scsipi/ch.c:1.84
--- src/sys/dev/scsipi/ch.c:1.83 Tue May 12 13:20:33 2009
+++ src/sys/dev/scsipi/ch.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.83 2009/05/12 13:20:33 cegger Exp $ */
+/* $NetBSD: ch.c,v 1.84 2009/05/12 14:44:31 cegger Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.83 2009/05/12 13:20:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.84 2009/05/12 14:44:31 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,8 +99,8 @@
#define CHF_ROTATE 0x01 /* picker can rotate */
/* Autoconfiguration glue */
-static int chmatch(struct device *, cfdata_t, void *);
-static void chattach(struct device *, struct device *, void *);
+static int chmatch(device_t, cfdata_t, void *);
+static void chattach(device_t, device_t, void *);
CFATTACH_DECL(ch, sizeof(struct ch_softc),
chmatch, chattach, NULL, NULL);
@@ -173,7 +173,7 @@
};
static int
-chmatch(struct device *parent, cfdata_t match,
+chmatch(device_t parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -187,7 +187,7 @@
}
static void
-chattach(struct device *parent, struct device *self, void *aux)
+chattach(device_t parent, device_t self, void *aux)
{
struct ch_softc *sc = device_private(self);
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.77 src/sys/dev/scsipi/if_se.c:1.78
--- src/sys/dev/scsipi/if_se.c:1.77 Tue May 12 13:20:33 2009
+++ src/sys/dev/scsipi/if_se.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.77 2009/05/12 13:20:33 cegger Exp $ */
+/* $NetBSD: if_se.c,v 1.78 2009/05/12 14:44:31 cegger Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.d...@dsto.defence.gov.au>
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.77 2009/05/12 13:20:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.78 2009/05/12 14:44:31 cegger Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -194,8 +194,8 @@
int sc_enabled;
};
-static int sematch(struct device *, cfdata_t, void *);
-static void seattach(struct device *, struct device *, void *);
+static int sematch(device_t, cfdata_t, void *);
+static void seattach(device_t, device_t, void *);
static void se_ifstart(struct ifnet *);
static void sestart(struct scsipi_periph *);
@@ -278,7 +278,7 @@
#define ETHER_CMP ether_cmp
static int
-sematch(struct device *parent, cfdata_t match, void *aux)
+sematch(device_t parent, cfdata_t match, void *aux)
{
struct scsipibus_attach_args *sa = aux;
int priority;
@@ -294,7 +294,7 @@
* a device suitable for this driver.
*/
static void
-seattach(struct device *parent, struct device *self, void *aux)
+seattach(device_t parent, device_t self, void *aux)
{
struct se_softc *sc = device_private(self);
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/ss.c
diff -u src/sys/dev/scsipi/ss.c:1.77 src/sys/dev/scsipi/ss.c:1.78
--- src/sys/dev/scsipi/ss.c:1.77 Tue May 12 13:20:33 2009
+++ src/sys/dev/scsipi/ss.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.77 2009/05/12 13:20:33 cegger Exp $ */
+/* $NetBSD: ss.c,v 1.78 2009/05/12 14:44:31 cegger Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.77 2009/05/12 13:20:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.78 2009/05/12 14:44:31 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,10 +69,10 @@
#define MODE_NONREWIND 1
#define MODE_CONTROL 3
-static int ssmatch(struct device *, cfdata_t, void *);
-static void ssattach(struct device *, struct device *, void *);
-static int ssdetach(struct device *self, int flags);
-static int ssactivate(struct device *self, enum devact act);
+static int ssmatch(device_t, cfdata_t, void *);
+static void ssattach(device_t, device_t, void *);
+static int ssdetach(device_t self, int flags);
+static int ssactivate(device_t self, enum devact act);
CFATTACH_DECL(ss, sizeof(struct ss_softc),
ssmatch, ssattach, ssdetach, ssactivate);
@@ -123,7 +123,7 @@
};
static int
-ssmatch(struct device *parent, cfdata_t match,
+ssmatch(device_t parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -142,7 +142,7 @@
* special handlers into the ss_softc structure
*/
static void
-ssattach(struct device *parent, struct device *self, void *aux)
+ssattach(device_t parent, device_t self, void *aux)
{
struct ss_softc *ss = device_private(self);
struct scsipibus_attach_args *sa = aux;
@@ -186,7 +186,7 @@
}
static int
-ssdetach(struct device *self, int flags)
+ssdetach(device_t self, int flags)
{
struct ss_softc *ss = device_private(self);
int s, cmaj, mn;
@@ -217,7 +217,7 @@
}
static int
-ssactivate(struct device *self, enum devact act)
+ssactivate(device_t self, enum devact act)
{
int rv = 0;
Index: src/sys/dev/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.252 src/sys/dev/scsipi/scsiconf.c:1.253
--- src/sys/dev/scsipi/scsiconf.c:1.252 Tue May 12 13:20:33 2009
+++ src/sys/dev/scsipi/scsiconf.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.252 2009/05/12 13:20:33 cegger Exp $ */
+/* $NetBSD: scsiconf.c,v 1.253 2009/05/12 14:44:31 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.252 2009/05/12 13:20:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.253 2009/05/12 14:44:31 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,12 +87,12 @@
static int scsi_probe_device(struct scsibus_softc *, int, int);
-static int scsibusmatch(struct device *, cfdata_t, void *);
-static void scsibusattach(struct device *, struct device *, void *);
-static int scsibusactivate(struct device *, enum devact);
-static int scsibusdetach(struct device *, int flags);
-static int scsibusrescan(struct device *, const char *, const int *);
-static void scsidevdetached(struct device *, struct device *);
+static int scsibusmatch(device_t, cfdata_t, void *);
+static void scsibusattach(device_t, device_t, void *);
+static int scsibusactivate(device_t, enum devact);
+static int scsibusdetach(device_t, int flags);
+static int scsibusrescan(device_t, const char *, const int *);
+static void scsidevdetached(device_t, device_t);
CFATTACH_DECL3_NEW(scsibus, sizeof(struct scsibus_softc),
scsibusmatch, scsibusattach, scsibusdetach, scsibusactivate,
@@ -138,7 +138,7 @@
}
static int
-scsibusmatch(struct device *parent, cfdata_t cf, void *aux)
+scsibusmatch(device_t parent, cfdata_t cf, void *aux)
{
struct scsipi_channel *chan = aux;
@@ -153,7 +153,7 @@
}
static void
-scsibusattach(struct device *parent, struct device *self, void *aux)
+scsibusattach(device_t parent, device_t self, void *aux)
{
struct scsibus_softc *sc = device_private(self);
struct scsipi_channel *chan = aux;
@@ -236,7 +236,7 @@
}
static int
-scsibusactivate(struct device *self, enum devact act)
+scsibusactivate(device_t self, enum devact act)
{
struct scsibus_softc *sc = device_private(self);
struct scsipi_channel *chan = sc->sc_channel;
@@ -272,7 +272,7 @@
}
static int
-scsibusdetach(struct device *self, int flags)
+scsibusdetach(device_t self, int flags)
{
struct scsibus_softc *sc = device_private(self);
struct scsipi_channel *chan = sc->sc_channel;
@@ -378,7 +378,7 @@
}
static int
-scsibusrescan(struct device *sc, const char *ifattr,
+scsibusrescan(device_t sc, const char *ifattr,
const int *locators)
{
@@ -390,7 +390,7 @@
}
static void
-scsidevdetached(struct device *sc, struct device *dev)
+scsidevdetached(device_t sc, device_t dev)
{
struct scsibus_softc *ssc = device_private(sc);
struct scsipi_channel *chan = ssc->sc_channel;
@@ -729,7 +729,7 @@
struct scsipibus_attach_args sa;
cfdata_t cf;
int locs[SCSIBUSCF_NLOCS];
- struct device *chld;
+ device_t chld;
/*
* Assume no more luns to search after this one.
Index: src/sys/dev/scsipi/scsipiconf.h
diff -u src/sys/dev/scsipi/scsipiconf.h:1.113 src/sys/dev/scsipi/scsipiconf.h:1.114
--- src/sys/dev/scsipi/scsipiconf.h:1.113 Mon Sep 8 23:36:54 2008
+++ src/sys/dev/scsipi/scsipiconf.h Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.h,v 1.113 2008/09/08 23:36:54 gmcgarry Exp $ */
+/* $NetBSD: scsipiconf.h,v 1.114 2009/05/12 14:44:31 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -186,7 +186,7 @@
* structure contains the channel number.
*/
struct scsipi_adapter {
- struct device *adapt_dev; /* pointer to adapter's device */
+ device_t adapt_dev; /* pointer to adapter's device */
int adapt_nchannels; /* number of adapter channels */
int adapt_refcnt; /* adapter's reference count */
int adapt_openings; /* total # of command openings */
@@ -198,7 +198,7 @@
void (*adapt_minphys)(struct buf *);
int (*adapt_ioctl)(struct scsipi_channel *, u_long,
void *, int, struct proc *);
- int (*adapt_enable)(struct device *, int);
+ int (*adapt_enable)(device_t, int);
int (*adapt_getgeom)(struct scsipi_periph *,
struct disk_parms *, u_long);
int (*adapt_accesschk)(struct scsipi_periph *,
@@ -342,7 +342,7 @@
* still be an improvement.
*/
struct scsipi_periph {
- struct device *periph_dev; /* pointer to peripherial's device */
+ device_t periph_dev; /* pointer to peripherial's device */
struct scsipi_channel *periph_channel; /* channel we're connected to */
/* link in channel's table of periphs */
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.280 src/sys/dev/scsipi/sd.c:1.281
--- src/sys/dev/scsipi/sd.c:1.280 Tue May 12 13:20:33 2009
+++ src/sys/dev/scsipi/sd.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.280 2009/05/12 13:20:33 cegger Exp $ */
+/* $NetBSD: sd.c,v 1.281 2009/05/12 14:44:31 cegger Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.280 2009/05/12 13:20:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.281 2009/05/12 14:44:31 cegger Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -123,10 +123,10 @@
static int sd_getcache(struct sd_softc *, int *);
static int sd_setcache(struct sd_softc *, int);
-static int sdmatch(struct device *, cfdata_t, void *);
-static void sdattach(struct device *, struct device *, void *);
-static int sdactivate(struct device *, enum devact);
-static int sddetach(struct device *, int);
+static int sdmatch(device_t, cfdata_t, void *);
+static void sdattach(device_t, device_t, void *);
+static int sdactivate(device_t, enum devact);
+static int sddetach(device_t, int);
static void sd_set_properties(struct sd_softc *);
CFATTACH_DECL3_NEW(sd, sizeof(struct sd_softc), sdmatch, sdattach, sddetach,
@@ -195,7 +195,7 @@
* A device suitable for this driver
*/
static int
-sdmatch(struct device *parent, cfdata_t match,
+sdmatch(device_t parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -212,7 +212,7 @@
* Attach routine common to atapi & scsi.
*/
static void
-sdattach(struct device *parent, struct device *self, void *aux)
+sdattach(device_t parent, device_t self, void *aux)
{
struct sd_softc *sd = device_private(self);
struct scsipibus_attach_args *sa = aux;
@@ -327,7 +327,7 @@
}
static int
-sdactivate(struct device *self, enum devact act)
+sdactivate(device_t self, enum devact act)
{
int rv = 0;
@@ -346,7 +346,7 @@
}
static int
-sddetach(struct device *self, int flags)
+sddetach(device_t self, int flags)
{
struct sd_softc *sd = device_private(self);
int s, bmaj, cmaj, i, mn;
Index: src/sys/dev/scsipi/ses.c
diff -u src/sys/dev/scsipi/ses.c:1.41 src/sys/dev/scsipi/ses.c:1.42
--- src/sys/dev/scsipi/ses.c:1.41 Tue May 12 13:20:33 2009
+++ src/sys/dev/scsipi/ses.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ses.c,v 1.41 2009/05/12 13:20:33 cegger Exp $ */
+/* $NetBSD: ses.c,v 1.42 2009/05/12 14:44:31 cegger Exp $ */
/*
* Copyright (C) 2000 National Aeronautics & Space Administration
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.41 2009/05/12 13:20:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.42 2009/05/12 14:44:31 cegger Exp $");
#include "opt_scsi.h"
@@ -167,8 +167,8 @@
#define SESUNIT(x) (minor((x)))
-static int ses_match(struct device *, cfdata_t, void *);
-static void ses_attach(struct device *, struct device *, void *);
+static int ses_match(device_t, cfdata_t, void *);
+static void ses_attach(device_t, device_t, void *);
static enctyp ses_device_type(struct scsipibus_attach_args *);
CFATTACH_DECL(ses, sizeof (struct ses_softc),
@@ -184,7 +184,7 @@
};
static int
-ses_match(struct device *parent, cfdata_t match,
+ses_match(device_t parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -213,7 +213,7 @@
* the softc available to set stuff in.
*/
static void
-ses_attach(struct device *parent, struct device *self, void *aux)
+ses_attach(device_t parent, device_t self, void *aux)
{
const char *tname;
struct ses_softc *softc = device_private(self);
Index: src/sys/dev/scsipi/st.c
diff -u src/sys/dev/scsipi/st.c:1.210 src/sys/dev/scsipi/st.c:1.211
--- src/sys/dev/scsipi/st.c:1.210 Tue Jan 13 13:35:54 2009
+++ src/sys/dev/scsipi/st.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.210 2009/01/13 13:35:54 yamt Exp $ */
+/* $NetBSD: st.c,v 1.211 2009/05/12 14:44:31 cegger Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.210 2009/01/13 13:35:54 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.211 2009/05/12 14:44:31 cegger Exp $");
#include "opt_scsi.h"
@@ -350,7 +350,7 @@
* A device suitable for this driver
*/
void
-stattach(struct device *parent, struct st_softc *st, void *aux)
+stattach(device_t parent, struct st_softc *st, void *aux)
{
struct scsipibus_attach_args *sa = aux;
struct scsipi_periph *periph = sa->sa_periph;
@@ -411,7 +411,7 @@
}
int
-stactivate(struct device *self, enum devact act)
+stactivate(device_t self, enum devact act)
{
int rv = 0;
@@ -430,7 +430,7 @@
}
int
-stdetach(struct device *self, int flags)
+stdetach(device_t self, int flags)
{
struct st_softc *st = device_private(self);
int s, bmaj, cmaj, mn;
Index: src/sys/dev/scsipi/st_atapi.c
diff -u src/sys/dev/scsipi/st_atapi.c:1.21 src/sys/dev/scsipi/st_atapi.c:1.22
--- src/sys/dev/scsipi/st_atapi.c:1.21 Tue May 12 13:20:33 2009
+++ src/sys/dev/scsipi/st_atapi.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: st_atapi.c,v 1.21 2009/05/12 13:20:33 cegger Exp $ */
+/* $NetBSD: st_atapi.c,v 1.22 2009/05/12 14:44:31 cegger Exp $ */
/*
* Copyright (c) 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.21 2009/05/12 13:20:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.22 2009/05/12 14:44:31 cegger Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -47,8 +47,8 @@
#include <dev/scsipi/stvar.h>
#include <dev/scsipi/atapi_tape.h>
-static int st_atapibus_match(struct device *, cfdata_t, void *);
-static void st_atapibus_attach(struct device *, struct device *, void *);
+static int st_atapibus_match(device_t, cfdata_t, void *);
+static void st_atapibus_attach(device_t, device_t, void *);
static int st_atapibus_ops(struct st_softc *, int, int);
static int st_atapibus_mode_sense(struct st_softc *, int);
static int st_atapibus_mode_select(struct st_softc *, int);
@@ -62,7 +62,7 @@
};
static int
-st_atapibus_match(struct device *parent, cfdata_t match,
+st_atapibus_match(device_t parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -79,7 +79,7 @@
}
static void
-st_atapibus_attach(struct device *parent, struct device *self, void *aux)
+st_atapibus_attach(device_t parent, device_t self, void *aux)
{
struct st_softc *st = device_private(self);
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/st_scsi.c
diff -u src/sys/dev/scsipi/st_scsi.c:1.28 src/sys/dev/scsipi/st_scsi.c:1.29
--- src/sys/dev/scsipi/st_scsi.c:1.28 Tue May 12 13:20:33 2009
+++ src/sys/dev/scsipi/st_scsi.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: st_scsi.c,v 1.28 2009/05/12 13:20:33 cegger Exp $ */
+/* $NetBSD: st_scsi.c,v 1.29 2009/05/12 14:44:31 cegger Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.28 2009/05/12 13:20:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.29 2009/05/12 14:44:31 cegger Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -67,8 +67,8 @@
#include <dev/scsipi/scsi_tape.h>
#include <dev/scsipi/stvar.h>
-static int st_scsibus_match(struct device *, cfdata_t, void *);
-static void st_scsibus_attach(struct device *, struct device *, void *);
+static int st_scsibus_match(device_t, cfdata_t, void *);
+static void st_scsibus_attach(device_t, device_t, void *);
static int st_scsibus_ops(struct st_softc *, int, int);
static int st_scsibus_read_block_limits(struct st_softc *, int);
static int st_scsibus_mode_sense(struct st_softc *, int);
@@ -84,7 +84,7 @@
};
static int
-st_scsibus_match(struct device *parent, cfdata_t match,
+st_scsibus_match(device_t parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -101,7 +101,7 @@
}
static void
-st_scsibus_attach(struct device *parent, struct device *self, void *aux)
+st_scsibus_attach(device_t parent, device_t self, void *aux)
{
struct st_softc *st = device_private(self);
Index: src/sys/dev/scsipi/stvar.h
diff -u src/sys/dev/scsipi/stvar.h:1.18 src/sys/dev/scsipi/stvar.h:1.19
--- src/sys/dev/scsipi/stvar.h:1.18 Mon Apr 28 20:23:58 2008
+++ src/sys/dev/scsipi/stvar.h Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: stvar.h,v 1.18 2008/04/28 20:23:58 martin Exp $ */
+/* $NetBSD: stvar.h,v 1.19 2009/05/12 14:44:31 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -178,8 +178,8 @@
ST_FIXEDBLOCKS | ST_READONLY | ST_FM_WRITTEN | \
ST_2FM_AT_EOD | ST_PER_ACTION | ST_POSUPDATED)
-void stattach(struct device *, struct st_softc *, void *);
-int stactivate(struct device *, enum devact);
-int stdetach(struct device *, int);
+void stattach(device_t, struct st_softc *, void *);
+int stactivate(device_t, enum devact);
+int stdetach(device_t, int);
extern struct cfdriver st_cd;
Index: src/sys/dev/scsipi/uk.c
diff -u src/sys/dev/scsipi/uk.c:1.57 src/sys/dev/scsipi/uk.c:1.58
--- src/sys/dev/scsipi/uk.c:1.57 Tue May 12 13:20:34 2009
+++ src/sys/dev/scsipi/uk.c Tue May 12 14:44:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uk.c,v 1.57 2009/05/12 13:20:34 cegger Exp $ */
+/* $NetBSD: uk.c,v 1.58 2009/05/12 14:44:31 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.57 2009/05/12 13:20:34 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.58 2009/05/12 14:44:31 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,10 +58,10 @@
struct scsipi_periph *sc_periph; /* all the inter level info */
};
-static int ukmatch(struct device *, cfdata_t, void *);
-static void ukattach(struct device *, struct device *, void *);
-static int ukactivate(struct device *, enum devact);
-static int ukdetach(struct device *, int);
+static int ukmatch(device_t, cfdata_t, void *);
+static void ukattach(device_t, device_t, void *);
+static int ukactivate(device_t, enum devact);
+static int ukdetach(device_t, int);
CFATTACH_DECL(uk, sizeof(struct uk_softc), ukmatch, ukattach, ukdetach,
@@ -79,7 +79,7 @@
};
static int
-ukmatch(struct device *parent, cfdata_t match,
+ukmatch(device_t parent, cfdata_t match,
void *aux)
{
@@ -91,7 +91,7 @@
* a device suitable for this driver.
*/
static void
-ukattach(struct device *parent, struct device *self, void *aux)
+ukattach(device_t parent, device_t self, void *aux)
{
struct uk_softc *uk = device_private(self);
struct scsipibus_attach_args *sa = aux;
@@ -109,7 +109,7 @@
}
static int
-ukactivate(struct device *self, enum devact act)
+ukactivate(device_t self, enum devact act)
{
int rv = 0;
@@ -128,7 +128,7 @@
}
static int
-ukdetach(struct device *self, int flags)
+ukdetach(device_t self, int flags)
{
/*struct uk_softc *uk = device_private(self);*/
int cmaj, mn;
