Module Name: src
Committed By: cegger
Date: Tue May 12 13:20:34 UTC 2009
Modified Files:
src/sys/dev/scsipi: atapiconf.c ch.c if_se.c scsiconf.c sd.c ses.c ss.c
st_atapi.c st_scsi.c uk.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/scsipi/atapiconf.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/scsipi/ch.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/scsipi/if_se.c src/sys/dev/scsipi/ss.c
cvs rdiff -u -r1.251 -r1.252 src/sys/dev/scsipi/scsiconf.c
cvs rdiff -u -r1.279 -r1.280 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/scsipi/ses.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/scsipi/st_atapi.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/scsipi/st_scsi.c
cvs rdiff -u -r1.56 -r1.57 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/atapiconf.c
diff -u src/sys/dev/scsipi/atapiconf.c:1.78 src/sys/dev/scsipi/atapiconf.c:1.79
--- src/sys/dev/scsipi/atapiconf.c:1.78 Tue Apr 7 18:35:17 2009
+++ src/sys/dev/scsipi/atapiconf.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atapiconf.c,v 1.78 2009/04/07 18:35:17 dyoung Exp $ */
+/* $NetBSD: atapiconf.c,v 1.79 2009/05/12 13:20:33 cegger Exp $ */
/*
* Copyright (c) 1996, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.78 2009/04/07 18:35:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.79 2009/05/12 13:20:33 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -277,7 +277,7 @@
{
struct scsipi_channel *chan = sc->sc_channel;
const struct scsi_quirk_inquiry_pattern *finger;
- struct cfdata *cf;
+ cfdata_t cf;
int priority, quirks;
finger = scsipi_inqmatch(
Index: src/sys/dev/scsipi/ch.c
diff -u src/sys/dev/scsipi/ch.c:1.82 src/sys/dev/scsipi/ch.c:1.83
--- src/sys/dev/scsipi/ch.c:1.82 Sun Jun 8 18:18:34 2008
+++ src/sys/dev/scsipi/ch.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.82 2008/06/08 18:18:34 tsutsui Exp $ */
+/* $NetBSD: ch.c,v 1.83 2009/05/12 13:20:33 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.82 2008/06/08 18:18:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.83 2009/05/12 13:20:33 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@
#define CHF_ROTATE 0x01 /* picker can rotate */
/* Autoconfiguration glue */
-static int chmatch(struct device *, struct cfdata *, void *);
+static int chmatch(struct device *, cfdata_t, void *);
static void chattach(struct device *, struct device *, void *);
CFATTACH_DECL(ch, sizeof(struct ch_softc),
@@ -173,7 +173,7 @@
};
static int
-chmatch(struct device *parent, struct cfdata *match,
+chmatch(struct device *parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.76 src/sys/dev/scsipi/if_se.c:1.77
--- src/sys/dev/scsipi/if_se.c:1.76 Sat Mar 14 21:04:23 2009
+++ src/sys/dev/scsipi/if_se.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.76 2009/03/14 21:04:23 dsl Exp $ */
+/* $NetBSD: if_se.c,v 1.77 2009/05/12 13:20:33 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.76 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.77 2009/05/12 13:20:33 cegger Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -194,7 +194,7 @@
int sc_enabled;
};
-static int sematch(struct device *, struct cfdata *, void *);
+static int sematch(struct device *, cfdata_t, void *);
static void seattach(struct device *, struct device *, void *);
static void se_ifstart(struct ifnet *);
@@ -278,7 +278,7 @@
#define ETHER_CMP ether_cmp
static int
-sematch(struct device *parent, struct cfdata *match, void *aux)
+sematch(struct device *parent, cfdata_t match, void *aux)
{
struct scsipibus_attach_args *sa = aux;
int priority;
Index: src/sys/dev/scsipi/ss.c
diff -u src/sys/dev/scsipi/ss.c:1.76 src/sys/dev/scsipi/ss.c:1.77
--- src/sys/dev/scsipi/ss.c:1.76 Tue Jan 13 13:35:54 2009
+++ src/sys/dev/scsipi/ss.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.76 2009/01/13 13:35:54 yamt Exp $ */
+/* $NetBSD: ss.c,v 1.77 2009/05/12 13:20:33 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.76 2009/01/13 13:35:54 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.77 2009/05/12 13:20:33 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@
#define MODE_NONREWIND 1
#define MODE_CONTROL 3
-static int ssmatch(struct device *, struct cfdata *, void *);
+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);
@@ -123,7 +123,7 @@
};
static int
-ssmatch(struct device *parent, struct cfdata *match,
+ssmatch(struct device *parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.251 src/sys/dev/scsipi/scsiconf.c:1.252
--- src/sys/dev/scsipi/scsiconf.c:1.251 Tue Apr 7 18:35:17 2009
+++ src/sys/dev/scsipi/scsiconf.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.251 2009/04/07 18:35:17 dyoung Exp $ */
+/* $NetBSD: scsiconf.c,v 1.252 2009/05/12 13:20:33 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.251 2009/04/07 18:35:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.252 2009/05/12 13:20:33 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@
static int scsi_probe_device(struct scsibus_softc *, int, int);
-static int scsibusmatch(struct device *, struct cfdata *, void *);
+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);
@@ -138,7 +138,7 @@
}
static int
-scsibusmatch(struct device *parent, struct cfdata *cf, void *aux)
+scsibusmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct scsipi_channel *chan = aux;
@@ -727,7 +727,7 @@
const struct scsi_quirk_inquiry_pattern *finger;
int checkdtype, priority, docontinue, quirks;
struct scsipibus_attach_args sa;
- struct cfdata *cf;
+ cfdata_t cf;
int locs[SCSIBUSCF_NLOCS];
struct device *chld;
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.279 src/sys/dev/scsipi/sd.c:1.280
--- src/sys/dev/scsipi/sd.c:1.279 Fri Apr 10 17:36:42 2009
+++ src/sys/dev/scsipi/sd.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.279 2009/04/10 17:36:42 dyoung Exp $ */
+/* $NetBSD: sd.c,v 1.280 2009/05/12 13:20:33 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.279 2009/04/10 17:36:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.280 2009/05/12 13:20:33 cegger Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -123,7 +123,7 @@
static int sd_getcache(struct sd_softc *, int *);
static int sd_setcache(struct sd_softc *, int);
-static int sdmatch(struct device *, struct cfdata *, void *);
+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);
@@ -195,7 +195,7 @@
* A device suitable for this driver
*/
static int
-sdmatch(struct device *parent, struct cfdata *match,
+sdmatch(struct device *parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/ses.c
diff -u src/sys/dev/scsipi/ses.c:1.40 src/sys/dev/scsipi/ses.c:1.41
--- src/sys/dev/scsipi/ses.c:1.40 Sun Jun 8 18:18:34 2008
+++ src/sys/dev/scsipi/ses.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ses.c,v 1.40 2008/06/08 18:18:34 tsutsui Exp $ */
+/* $NetBSD: ses.c,v 1.41 2009/05/12 13:20:33 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.40 2008/06/08 18:18:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.41 2009/05/12 13:20:33 cegger Exp $");
#include "opt_scsi.h"
@@ -167,7 +167,7 @@
#define SESUNIT(x) (minor((x)))
-static int ses_match(struct device *, struct cfdata *, void *);
+static int ses_match(struct device *, cfdata_t, void *);
static void ses_attach(struct device *, struct device *, void *);
static enctyp ses_device_type(struct scsipibus_attach_args *);
@@ -184,7 +184,7 @@
};
static int
-ses_match(struct device *parent, struct cfdata *match,
+ses_match(struct device *parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/st_atapi.c
diff -u src/sys/dev/scsipi/st_atapi.c:1.20 src/sys/dev/scsipi/st_atapi.c:1.21
--- src/sys/dev/scsipi/st_atapi.c:1.20 Thu Nov 16 01:33:26 2006
+++ src/sys/dev/scsipi/st_atapi.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: st_atapi.c,v 1.20 2006/11/16 01:33:26 christos Exp $ */
+/* $NetBSD: st_atapi.c,v 1.21 2009/05/12 13:20:33 cegger Exp $ */
/*
* Copyright (c) 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.20 2006/11/16 01:33:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.21 2009/05/12 13:20:33 cegger Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -47,7 +47,7 @@
#include <dev/scsipi/stvar.h>
#include <dev/scsipi/atapi_tape.h>
-static int st_atapibus_match(struct device *, struct cfdata *, void *);
+static int st_atapibus_match(struct device *, cfdata_t, void *);
static void st_atapibus_attach(struct device *, struct device *, void *);
static int st_atapibus_ops(struct st_softc *, int, int);
static int st_atapibus_mode_sense(struct st_softc *, int);
@@ -62,7 +62,7 @@
};
static int
-st_atapibus_match(struct device *parent, struct cfdata *match,
+st_atapibus_match(struct device *parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/st_scsi.c
diff -u src/sys/dev/scsipi/st_scsi.c:1.27 src/sys/dev/scsipi/st_scsi.c:1.28
--- src/sys/dev/scsipi/st_scsi.c:1.27 Mon Apr 28 20:23:58 2008
+++ src/sys/dev/scsipi/st_scsi.c Tue May 12 13:20:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: st_scsi.c,v 1.27 2008/04/28 20:23:58 martin Exp $ */
+/* $NetBSD: st_scsi.c,v 1.28 2009/05/12 13:20:33 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.27 2008/04/28 20:23:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.28 2009/05/12 13:20:33 cegger Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -67,7 +67,7 @@
#include <dev/scsipi/scsi_tape.h>
#include <dev/scsipi/stvar.h>
-static int st_scsibus_match(struct device *, struct cfdata *, void *);
+static int st_scsibus_match(struct device *, cfdata_t, void *);
static void st_scsibus_attach(struct device *, struct device *, void *);
static int st_scsibus_ops(struct st_softc *, int, int);
static int st_scsibus_read_block_limits(struct st_softc *, int);
@@ -84,7 +84,7 @@
};
static int
-st_scsibus_match(struct device *parent, struct cfdata *match,
+st_scsibus_match(struct device *parent, cfdata_t match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
Index: src/sys/dev/scsipi/uk.c
diff -u src/sys/dev/scsipi/uk.c:1.56 src/sys/dev/scsipi/uk.c:1.57
--- src/sys/dev/scsipi/uk.c:1.56 Sun Jan 11 10:58:26 2009
+++ src/sys/dev/scsipi/uk.c Tue May 12 13:20:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uk.c,v 1.56 2009/01/11 10:58:26 cegger Exp $ */
+/* $NetBSD: uk.c,v 1.57 2009/05/12 13:20:34 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.56 2009/01/11 10:58:26 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.57 2009/05/12 13:20:34 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@
struct scsipi_periph *sc_periph; /* all the inter level info */
};
-static int ukmatch(struct device *, struct cfdata *, void *);
+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);
@@ -79,7 +79,7 @@
};
static int
-ukmatch(struct device *parent, struct cfdata *match,
+ukmatch(struct device *parent, cfdata_t match,
void *aux)
{
