Module Name: src
Committed By: mlelstv
Date: Sun Apr 26 15:15:20 UTC 2015
Modified Files:
src/sys/arch/acorn32/mainbus: fd.c
src/sys/arch/amiga/dev: fd.c
src/sys/arch/arc/jazz: fd.c
src/sys/arch/atari/dev: fd.c hdfd.c
src/sys/arch/dreamcast/dev: gdrom.c
src/sys/arch/dreamcast/dev/maple: mmemcard.c
src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c
src/sys/arch/mac68k/obio: iwm_fd.c
src/sys/arch/sparc/dev: fd.c
src/sys/arch/sparc64/dev: fdc.c
src/sys/arch/sun3/dev: fd.c xd.c xy.c
src/sys/arch/x68k/dev: bmd.c fd.c
src/sys/dev: md.c vnd.c
src/sys/dev/altmem: altmem.c
src/sys/dev/ata: wd.c
src/sys/dev/isa: fd.c mcd.c
src/sys/dev/mca: ed_mca.c
src/sys/dev/mscp: mscp_disk.c
src/sys/dev/ofw: ofdisk.c
src/sys/dev/qbus: rf.c rl.c
src/sys/dev/raidframe: rf_netbsdkintf.c
src/sys/dev/scsipi: cd.c sd.c
src/sys/dev/spi: spiflash.c
src/sys/dev/vme: xd.c xy.c
Log Message:
Use C99-style initializers for struct dkdriver.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/amiga/dev/fd.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arc/jazz/fd.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/dreamcast/dev/gdrom.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/dreamcast/dev/maple/mmemcard.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/emips/ebus/ace_ebus.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/emips/ebus/flash_ebus.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/mac68k/obio/iwm_fd.c
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/sparc/dev/fd.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/sun3/dev/xd.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sun3/dev/xy.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x68k/dev/bmd.c
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/md.c
cvs rdiff -u -r1.242 -r1.243 src/sys/dev/vnd.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/altmem/altmem.c
cvs rdiff -u -r1.419 -r1.420 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.108 -r1.109 src/sys/dev/isa/fd.c
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/isa/mcd.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/mca/ed_mca.c
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/mscp/mscp_disk.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ofw/ofdisk.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/qbus/rf.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/qbus/rl.c
cvs rdiff -u -r1.322 -r1.323 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.329 -r1.330 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/spi/spiflash.c
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/vme/xd.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/vme/xy.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/arch/acorn32/mainbus/fd.c
diff -u src/sys/arch/acorn32/mainbus/fd.c:1.57 src/sys/arch/acorn32/mainbus/fd.c:1.58
--- src/sys/arch/acorn32/mainbus/fd.c:1.57 Fri Jan 2 19:42:05 2015
+++ src/sys/arch/acorn32/mainbus/fd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.57 2015/01/02 19:42:05 christos Exp $ */
+/* $NetBSD: fd.c,v 1.58 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.57 2015/01/02 19:42:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.58 2015/04/26 15:15:19 mlelstv Exp $");
#include "opt_ddb.h"
@@ -296,7 +296,9 @@ void fdgetdisklabel(struct fd_softc *);
int fd_get_parms(struct fd_softc *);
void fdstart(struct fd_softc *);
-struct dkdriver fddkdriver = { fdstrategy };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
struct fd_type *fd_nvtotype(const char *, int, int);
void fd_set_motor(struct fdc_softc *fdc, int reset);
Index: src/sys/arch/amiga/dev/fd.c
diff -u src/sys/arch/amiga/dev/fd.c:1.95 src/sys/arch/amiga/dev/fd.c:1.96
--- src/sys/arch/amiga/dev/fd.c:1.95 Fri Jan 2 19:42:05 2015
+++ src/sys/arch/amiga/dev/fd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.95 2015/01/02 19:42:05 christos Exp $ */
+/* $NetBSD: fd.c,v 1.96 2015/04/26 15:15:19 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.95 2015/01/02 19:42:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.96 2015/04/26 15:15:19 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -279,7 +279,9 @@ const struct cdevsw fd_cdevsw = {
.d_flag = D_DISK
};
-struct dkdriver fddkdriver = { fdstrategy };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
CFATTACH_DECL_NEW(fdc, 0,
fdcmatch, fdcattach, NULL, NULL);
Index: src/sys/arch/arc/jazz/fd.c
diff -u src/sys/arch/arc/jazz/fd.c:1.46 src/sys/arch/arc/jazz/fd.c:1.47
--- src/sys/arch/arc/jazz/fd.c:1.46 Fri Jan 2 19:42:05 2015
+++ src/sys/arch/arc/jazz/fd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.46 2015/01/02 19:42:05 christos Exp $ */
+/* $NetBSD: fd.c,v 1.47 2015/04/26 15:15:19 mlelstv Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.46 2015/01/02 19:42:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.47 2015/04/26 15:15:19 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -214,7 +214,9 @@ const struct cdevsw fd_cdevsw = {
static void fdstart(struct fd_softc *);
-struct dkdriver fddkdriver = { fdstrategy };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
static bool fd_shutdown(device_t, int);
#if 0
Index: src/sys/arch/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.83 src/sys/arch/atari/dev/fd.c:1.84
--- src/sys/arch/atari/dev/fd.c:1.83 Fri Jan 2 19:42:05 2015
+++ src/sys/arch/atari/dev/fd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.83 2015/01/02 19:42:05 christos Exp $ */
+/* $NetBSD: fd.c,v 1.84 2015/04/26 15:15:19 mlelstv Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.83 2015/01/02 19:42:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.84 2015/04/26 15:15:19 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -379,7 +379,9 @@ fdcprint(void *aux, const char *pnp)
static int fdmatch(device_t, cfdata_t, void *);
static void fdattach(device_t, device_t, void *);
-struct dkdriver fddkdriver = { fdstrategy };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
CFATTACH_DECL_NEW(fd, sizeof(struct fd_softc),
fdmatch, fdattach, NULL, NULL);
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.80 src/sys/arch/atari/dev/hdfd.c:1.81
--- src/sys/arch/atari/dev/hdfd.c:1.80 Fri Jan 2 19:42:05 2015
+++ src/sys/arch/atari/dev/hdfd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.80 2015/01/02 19:42:05 christos Exp $ */
+/* $NetBSD: hdfd.c,v 1.81 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.80 2015/01/02 19:42:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.81 2015/04/26 15:15:19 mlelstv Exp $");
#include "opt_ddb.h"
@@ -313,7 +313,9 @@ const struct cdevsw fd_cdevsw = {
void fdstart(struct fd_softc *);
-struct dkdriver fddkdriver = { fdstrategy };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
void fd_set_motor(struct fdc_softc *, int);
void fd_motor_off(void *);
Index: src/sys/arch/dreamcast/dev/gdrom.c
diff -u src/sys/arch/dreamcast/dev/gdrom.c:1.40 src/sys/arch/dreamcast/dev/gdrom.c:1.41
--- src/sys/arch/dreamcast/dev/gdrom.c:1.40 Fri Jul 25 08:10:32 2014
+++ src/sys/arch/dreamcast/dev/gdrom.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gdrom.c,v 1.40 2014/07/25 08:10:32 dholland Exp $ */
+/* $NetBSD: gdrom.c,v 1.41 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gdrom.c,v 1.40 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdrom.c,v 1.41 2015/04/26 15:15:19 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,9 @@ struct gdrom_softc {
CFATTACH_DECL_NEW(gdrom, sizeof(struct gdrom_softc),
gdrommatch, gdromattach, NULL, NULL);
-struct dkdriver gdromdkdriver = { gdromstrategy };
+struct dkdriver gdromdkdriver = {
+ .d_strategy = gdromstrategy
+};
struct gd_toc {
Index: src/sys/arch/dreamcast/dev/maple/mmemcard.c
diff -u src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.25 src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.26
--- src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.25 Fri Jan 2 19:42:05 2015
+++ src/sys/arch/dreamcast/dev/maple/mmemcard.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mmemcard.c,v 1.25 2015/01/02 19:42:05 christos Exp $ */
+/* $NetBSD: mmemcard.c,v 1.26 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmemcard.c,v 1.25 2015/01/02 19:42:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmemcard.c,v 1.26 2015/04/26 15:15:19 mlelstv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -217,7 +217,9 @@ const struct cdevsw mmem_cdevsw = {
CFATTACH_DECL_NEW(mmem, sizeof(struct mmem_softc),
mmemmatch, mmemattach, mmemdetach, NULL);
-struct dkdriver mmemdkdriver = { mmemstrategy };
+struct dkdriver mmemdkdriver = {
+ .d_strategy = mmemstrategy
+};
static int
mmemmatch(device_t parent, cfdata_t cf, void *aux)
Index: src/sys/arch/emips/ebus/ace_ebus.c
diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.18 src/sys/arch/emips/ebus/ace_ebus.c:1.19
--- src/sys/arch/emips/ebus/ace_ebus.c:1.18 Mon Apr 13 21:18:41 2015
+++ src/sys/arch/emips/ebus/ace_ebus.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ace_ebus.c,v 1.18 2015/04/13 21:18:41 riastradh Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.19 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.18 2015/04/13 21:18:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.19 2015/04/26 15:15:19 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1585,7 +1585,10 @@ void acestart(void *);
void __acestart(struct ace_softc*, struct buf *);
void acerestart(void *);
-struct dkdriver acedkdriver = { acestrategy, minphys };
+struct dkdriver acedkdriver = {
+ .d_strategy = acestrategy,
+ .d_minphys = minphys
+};
#ifdef HAS_BAD144_HANDLING
static void bad144intern(struct ace_softc *);
Index: src/sys/arch/emips/ebus/flash_ebus.c
diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.16 src/sys/arch/emips/ebus/flash_ebus.c:1.17
--- src/sys/arch/emips/ebus/flash_ebus.c:1.16 Mon Apr 13 21:18:41 2015
+++ src/sys/arch/emips/ebus/flash_ebus.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.16 2015/04/13 21:18:41 riastradh Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.17 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.16 2015/04/13 21:18:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.17 2015/04/26 15:15:19 mlelstv Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -1431,7 +1431,10 @@ int eflashactivate(device_t, enum deva
void eflashdone(struct eflash_softc *);
static void eflash_set_geometry(struct eflash_softc *sc);
-struct dkdriver eflashdkdriver = { eflashstrategy, minphys };
+struct dkdriver eflashdkdriver = {
+ .d_strategy = eflashstrategy,
+ .d_minphys = minphys
+};
#ifdef HAS_BAD144_HANDLING
static void bad144intern(struct eflash_softc *);
Index: src/sys/arch/mac68k/obio/iwm_fd.c
diff -u src/sys/arch/mac68k/obio/iwm_fd.c:1.55 src/sys/arch/mac68k/obio/iwm_fd.c:1.56
--- src/sys/arch/mac68k/obio/iwm_fd.c:1.55 Sat Jan 3 16:44:14 2015
+++ src/sys/arch/mac68k/obio/iwm_fd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iwm_fd.c,v 1.55 2015/01/03 16:44:14 christos Exp $ */
+/* $NetBSD: iwm_fd.c,v 1.56 2015/04/26 15:15:19 mlelstv Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.55 2015/01/03 16:44:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.56 2015/04/26 15:15:19 mlelstv Exp $");
#include "locators.h"
@@ -260,7 +260,7 @@ const struct cdevsw fd_cdevsw = {
/* disk(9) framework device switch */
struct dkdriver fd_dkDriver = {
- fdstrategy
+ .d_strategy = fdstrategy
};
/*** Configure the IWM controller ***/
Index: src/sys/arch/sparc/dev/fd.c
diff -u src/sys/arch/sparc/dev/fd.c:1.156 src/sys/arch/sparc/dev/fd.c:1.157
--- src/sys/arch/sparc/dev/fd.c:1.156 Fri Jan 2 19:42:06 2015
+++ src/sys/arch/sparc/dev/fd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.156 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: fd.c,v 1.157 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.156 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.157 2015/04/26 15:15:19 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -337,7 +337,9 @@ int fd_get_parms(struct fd_softc *);
void fdstart(struct fd_softc *);
int fdprint(void *, const char *);
-struct dkdriver fddkdriver = { fdstrategy };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
struct fd_type *fd_nvtotype(char *, int, int);
void fd_set_motor(struct fdc_softc *);
Index: src/sys/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.43 src/sys/arch/sparc64/dev/fdc.c:1.44
--- src/sys/arch/sparc64/dev/fdc.c:1.43 Fri Jan 2 19:42:06 2015
+++ src/sys/arch/sparc64/dev/fdc.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc.c,v 1.43 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: fdc.c,v 1.44 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.43 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.44 2015/04/26 15:15:19 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -370,7 +370,9 @@ void fdstrategy(struct buf *);
void fdstart(struct fd_softc *);
int fdprint(void *, const char *);
-struct dkdriver fddkdriver = { fdstrategy, NULL };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
struct fd_type *fd_nvtotype(char *, int, int);
void fd_set_motor(struct fdc_softc *);
Index: src/sys/arch/sun3/dev/fd.c
diff -u src/sys/arch/sun3/dev/fd.c:1.79 src/sys/arch/sun3/dev/fd.c:1.80
--- src/sys/arch/sun3/dev/fd.c:1.79 Fri Jan 2 19:42:06 2015
+++ src/sys/arch/sun3/dev/fd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.79 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: fd.c,v 1.80 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.79 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.80 2015/04/26 15:15:19 mlelstv Exp $");
#include "opt_ddb.h"
@@ -309,7 +309,9 @@ static void fdgetdisklabel(dev_t);
static void fdstart(struct fd_softc *);
static int fdprint(void *, const char *);
-struct dkdriver fddkdriver = { fdstrategy };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
static void fd_set_motor(struct fdc_softc *);
static void fd_motor_off(void *);
Index: src/sys/arch/sun3/dev/xd.c
diff -u src/sys/arch/sun3/dev/xd.c:1.72 src/sys/arch/sun3/dev/xd.c:1.73
--- src/sys/arch/sun3/dev/xd.c:1.72 Wed Dec 31 19:52:05 2014
+++ src/sys/arch/sun3/dev/xd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.72 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: xd.c,v 1.73 2015/04/26 15:15:19 mlelstv Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.72 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.73 2015/04/26 15:15:19 mlelstv Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -315,7 +315,9 @@ const struct cdevsw xd_cdevsw = {
* dkdriver
*/
-struct dkdriver xddkdriver = { xdstrategy };
+struct dkdriver xddkdriver = {
+ .d_strategy = xdstrategy
+};
/*
* start: disk label fix code (XXX)
Index: src/sys/arch/sun3/dev/xy.c
diff -u src/sys/arch/sun3/dev/xy.c:1.77 src/sys/arch/sun3/dev/xy.c:1.78
--- src/sys/arch/sun3/dev/xy.c:1.77 Wed Dec 31 19:52:05 2014
+++ src/sys/arch/sun3/dev/xy.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.77 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: xy.c,v 1.78 2015/04/26 15:15:19 mlelstv Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.77 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.78 2015/04/26 15:15:19 mlelstv Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -246,7 +246,9 @@ const struct cdevsw xy_cdevsw = {
* dkdriver
*/
-struct dkdriver xydkdriver = { xystrategy };
+struct dkdriver xydkdriver = {
+ .d_strategy = xystrategy
+};
/*
* start: disk label fix code (XXX)
Index: src/sys/arch/x68k/dev/bmd.c
diff -u src/sys/arch/x68k/dev/bmd.c:1.23 src/sys/arch/x68k/dev/bmd.c:1.24
--- src/sys/arch/x68k/dev/bmd.c:1.23 Fri Jan 2 19:42:06 2015
+++ src/sys/arch/x68k/dev/bmd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bmd.c,v 1.23 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: bmd.c,v 1.24 2015/04/26 15:15:19 mlelstv Exp $ */
/*
* Copyright (c) 2002 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.23 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.24 2015/04/26 15:15:19 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,7 +131,9 @@ const struct cdevsw bmd_cdevsw = {
.d_flag = D_DISK
};
-struct dkdriver bmddkdriver = { bmdstrategy };
+struct dkdriver bmddkdriver = {
+ .d_strategy = bmdstrategy
+};
static int
bmd_match(device_t parent, cfdata_t cf, void *aux)
Index: src/sys/arch/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.116 src/sys/arch/x68k/dev/fd.c:1.117
--- src/sys/arch/x68k/dev/fd.c:1.116 Mon Apr 13 21:18:43 2015
+++ src/sys/arch/x68k/dev/fd.c Sun Apr 26 15:15:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.116 2015/04/13 21:18:43 riastradh Exp $ */
+/* $NetBSD: fd.c,v 1.117 2015/04/26 15:15:19 mlelstv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.116 2015/04/13 21:18:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.117 2015/04/26 15:15:19 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_m68k_arch.h"
@@ -298,7 +298,9 @@ const struct cdevsw fd_cdevsw = {
void fdstart(struct fd_softc *);
-struct dkdriver fddkdriver = { fdstrategy };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy
+};
void fd_set_motor(struct fdc_softc *, int);
void fd_motor_off(void *);
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.73 src/sys/dev/md.c:1.74
--- src/sys/dev/md.c:1.73 Fri Jan 2 19:42:06 2015
+++ src/sys/dev/md.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.73 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: md.c,v 1.74 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.73 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.74 2015/04/26 15:15:20 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -132,7 +132,9 @@ const struct cdevsw md_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver mddkdriver = { mdstrategy, NULL };
+static struct dkdriver mddkdriver = {
+ .d_strategy = mdstrategy
+};
extern struct cfdriver md_cd;
CFATTACH_DECL3_NEW(md, sizeof(struct md_softc),
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.242 src/sys/dev/vnd.c:1.243
--- src/sys/dev/vnd.c:1.242 Mon Apr 6 12:02:08 2015
+++ src/sys/dev/vnd.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.242 2015/04/06 12:02:08 mlelstv Exp $ */
+/* $NetBSD: vnd.c,v 1.243 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.242 2015/04/06 12:02:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.243 2015/04/26 15:15:20 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -233,7 +233,10 @@ extern struct cfdriver vnd_cd;
static struct vnd_softc *vnd_spawn(int);
int vnd_destroy(device_t);
-static struct dkdriver vnddkdriver = { vndstrategy, minphys };
+static struct dkdriver vnddkdriver = {
+ .d_strategy = vndstrategy,
+ .d_minphys = minphys
+};
void
vndattach(int num)
Index: src/sys/dev/altmem/altmem.c
diff -u src/sys/dev/altmem/altmem.c:1.4 src/sys/dev/altmem/altmem.c:1.5
--- src/sys/dev/altmem/altmem.c:1.4 Fri Jul 25 08:10:36 2014
+++ src/sys/dev/altmem/altmem.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: altmem.c,v 1.4 2014/07/25 08:10:36 dholland Exp $ */
+/* $NetBSD: altmem.c,v 1.5 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.4 2014/07/25 08:10:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.5 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/types.h>
#include <sys/device.h>
@@ -83,7 +83,10 @@ const struct cdevsw altmem_cdevsw = {
.d_discard = nodiscard,
.d_flag = D_DISK
};
-static struct dkdriver altmemdkdriver = { altmemstrategy, minphys };
+static struct dkdriver altmemdkdriver = {
+ .d_strategy = altmemstrategy,
+ .d_minphys = minphys
+};
extern struct cfdriver altmem_cd;
CFATTACH_DECL_NEW(altmem, sizeof(struct altmem_softc), altmem_match,
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.419 src/sys/dev/ata/wd.c:1.420
--- src/sys/dev/ata/wd.c:1.419 Mon Apr 13 16:33:24 2015
+++ src/sys/dev/ata/wd.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.419 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: wd.c,v 1.420 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.419 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.420 2015/04/26 15:15:20 mlelstv Exp $");
#include "opt_ata.h"
@@ -202,7 +202,10 @@ bool wd_shutdown(device_t, int);
int wd_getcache(struct wd_softc *, int *);
int wd_setcache(struct wd_softc *, int);
-struct dkdriver wddkdriver = { wdstrategy, wdminphys };
+struct dkdriver wddkdriver = {
+ .d_strategy = wdstrategy,
+ .d_minphys = wdminphys
+};
#ifdef HAS_BAD144_HANDLING
static void bad144intern(struct wd_softc *);
Index: src/sys/dev/isa/fd.c
diff -u src/sys/dev/isa/fd.c:1.108 src/sys/dev/isa/fd.c:1.109
--- src/sys/dev/isa/fd.c:1.108 Mon Apr 13 16:33:24 2015
+++ src/sys/dev/isa/fd.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.108 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: fd.c,v 1.109 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.108 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.109 2015/04/26 15:15:20 mlelstv Exp $");
#include "opt_ddb.h"
@@ -253,7 +253,10 @@ void fdgetdisklabel(struct fd_softc *);
int fd_get_parms(struct fd_softc *);
void fdstart(struct fd_softc *);
-struct dkdriver fddkdriver = { fdstrategy, NULL };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy,
+ .d_minphys = minphys
+};
#if defined(i386) || defined(x86_64)
const struct fd_type *fd_nvtotype(const char *, int, int);
Index: src/sys/dev/isa/mcd.c
diff -u src/sys/dev/isa/mcd.c:1.114 src/sys/dev/isa/mcd.c:1.115
--- src/sys/dev/isa/mcd.c:1.114 Wed Dec 31 19:52:05 2014
+++ src/sys/dev/isa/mcd.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.114 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: mcd.c,v 1.115 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.114 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.115 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,7 +239,9 @@ int mcd_get_parms(struct mcd_softc *);
void mcdstart(struct mcd_softc *);
void mcd_pseudointr(void *);
-struct dkdriver mcddkdriver = { mcdstrategy, NULL, };
+struct dkdriver mcddkdriver = {
+ .d_strategy = mcdstrategy
+};
#define MCD_RETRIES 3
#define MCD_RDRETRIES 3
Index: src/sys/dev/mca/ed_mca.c
diff -u src/sys/dev/mca/ed_mca.c:1.63 src/sys/dev/mca/ed_mca.c:1.64
--- src/sys/dev/mca/ed_mca.c:1.63 Mon Apr 13 16:33:24 2015
+++ src/sys/dev/mca/ed_mca.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.63 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: ed_mca.c,v 1.64 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.63 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.64 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,10 @@ const struct cdevsw ed_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver eddkdriver = { edmcastrategy, minphys };
+static struct dkdriver eddkdriver = {
+ .d_strategy = edmcastrategy,
+ .d_minphys = minphys
+};
/*
* Just check if it's possible to identify the disk.
Index: src/sys/dev/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.87 src/sys/dev/mscp/mscp_disk.c:1.88
--- src/sys/dev/mscp/mscp_disk.c:1.87 Fri Jan 2 19:42:07 2015
+++ src/sys/dev/mscp/mscp_disk.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.87 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.88 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.87 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.88 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -183,7 +183,8 @@ const struct cdevsw ra_cdevsw = {
};
static struct dkdriver radkdriver = {
- rastrategy, minphys
+ .d_strategy = rastrategy,
+ .d_minphys = minphys
};
/*
Index: src/sys/dev/ofw/ofdisk.c
diff -u src/sys/dev/ofw/ofdisk.c:1.50 src/sys/dev/ofw/ofdisk.c:1.51
--- src/sys/dev/ofw/ofdisk.c:1.50 Wed Dec 31 19:52:06 2014
+++ src/sys/dev/ofw/ofdisk.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.50 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: ofdisk.c,v 1.51 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.50 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.51 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -108,7 +108,10 @@ const struct cdevsw ofdisk_cdevsw = {
static void ofminphys(struct buf *);
-struct dkdriver ofdisk_dkdriver = { ofdisk_strategy, ofminphys };
+struct dkdriver ofdisk_dkdriver = {
+ .d_strategy = ofdisk_strategy,
+ .d_minphys = ofminphys
+};
void ofdisk_getdefaultlabel (struct ofdisk_softc *, struct disklabel *);
void ofdisk_getdisklabel (dev_t);
Index: src/sys/dev/qbus/rf.c
diff -u src/sys/dev/qbus/rf.c:1.31 src/sys/dev/qbus/rf.c:1.32
--- src/sys/dev/qbus/rf.c:1.31 Fri Jan 2 19:42:07 2015
+++ src/sys/dev/qbus/rf.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf.c,v 1.31 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: rf.c,v 1.32 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
@@ -36,7 +36,7 @@ TODO:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.31 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.32 2015/04/26 15:15:20 mlelstv Exp $");
/* autoconfig stuff */
#include <sys/param.h>
@@ -202,7 +202,7 @@ struct rfc_attach_args {
const struct dkdriver rfdkdriver = {
- rfstrategy
+ .d_strategy = rfstrategy
};
Index: src/sys/dev/qbus/rl.c
diff -u src/sys/dev/qbus/rl.c:1.49 src/sys/dev/qbus/rl.c:1.50
--- src/sys/dev/qbus/rl.c:1.49 Fri Jan 2 19:42:07 2015
+++ src/sys/dev/qbus/rl.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.49 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: rl.c,v 1.50 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.49 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.50 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -140,7 +140,8 @@ static const char * const rlstates[] = {
};
static const struct dkdriver rldkdriver = {
- rlstrategy, minphys
+ .d_strategy = rlstrategy,
+ .d_minphys = minphys
};
static const char *
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.322 src/sys/dev/raidframe/rf_netbsdkintf.c:1.323
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.322 Sat Jan 3 11:48:04 2015
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.322 2015/01/03 11:48:04 prlw1 Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.323 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.322 2015/01/03 11:48:04 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.323 2015/04/26 15:15:20 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -230,7 +230,10 @@ const struct cdevsw raid_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver rf_dkdriver = { raidstrategy, minphys };
+static struct dkdriver rf_dkdriver = {
+ .d_strategy = raidstrategy,
+ .d_minphys = minphys
+};
struct raid_softc {
device_t sc_dev;
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.329 src/sys/dev/scsipi/cd.c:1.330
--- src/sys/dev/scsipi/cd.c:1.329 Mon Apr 13 16:33:25 2015
+++ src/sys/dev/scsipi/cd.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.329 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: cd.c,v 1.330 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.329 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.330 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,7 +229,10 @@ const struct cdevsw cd_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver cddkdriver = { cdstrategy, NULL };
+static struct dkdriver cddkdriver = {
+ .d_strategy = cdstrategy,
+ .d_minphys = cdminphys
+};
static const struct scsipi_periphsw cd_switch = {
cd_interpret_sense, /* use our error handler first */
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.315 src/sys/dev/scsipi/sd.c:1.316
--- src/sys/dev/scsipi/sd.c:1.315 Mon Apr 13 16:33:25 2015
+++ src/sys/dev/scsipi/sd.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.315 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: sd.c,v 1.316 2015/04/26 15:15:20 mlelstv 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.315 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.316 2015/04/26 15:15:20 mlelstv Exp $");
#include "opt_scsi.h"
@@ -181,7 +181,10 @@ const struct cdevsw sd_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver sddkdriver = { sdstrategy, sdminphys };
+static struct dkdriver sddkdriver = {
+ .d_strategy = sdstrategy,
+ .d_minphys = sdminphys
+};
static const struct scsipi_periphsw sd_switch = {
sd_interpret_sense, /* check our error handler first */
Index: src/sys/dev/spi/spiflash.c
diff -u src/sys/dev/spi/spiflash.c:1.16 src/sys/dev/spi/spiflash.c:1.17
--- src/sys/dev/spi/spiflash.c:1.16 Sat Oct 11 13:56:01 2014
+++ src/sys/dev/spi/spiflash.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spiflash.c,v 1.16 2014/10/11 13:56:01 mlelstv Exp $ */
+/* $NetBSD: spiflash.c,v 1.17 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.16 2014/10/11 13:56:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.17 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -166,7 +166,9 @@ const struct cdevsw spiflash_cdevsw = {
.d_flag = D_DISK,
};
-static struct dkdriver spiflash_dkdriver = { spiflash_strategy, NULL };
+static struct dkdriver spiflash_dkdriver = {
+ .d_strategy = spiflash_strategy
+};
spiflash_handle_t
spiflash_attach_mi(const struct spiflash_hw_if *hw, void *cookie,
Index: src/sys/dev/vme/xd.c
diff -u src/sys/dev/vme/xd.c:1.94 src/sys/dev/vme/xd.c:1.95
--- src/sys/dev/vme/xd.c:1.94 Wed Dec 31 19:52:06 2014
+++ src/sys/dev/vme/xd.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.94 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: xd.c,v 1.95 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.94 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.95 2015/04/26 15:15:20 mlelstv Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -327,7 +327,9 @@ struct xdc_attach_args { /* this is the
* dkdriver
*/
-struct dkdriver xddkdriver = {xdstrategy};
+struct dkdriver xddkdriver = {
+ .d_strategy = xdstrategy
+};
/*
* start: disk label fix code (XXX)
Index: src/sys/dev/vme/xy.c
diff -u src/sys/dev/vme/xy.c:1.98 src/sys/dev/vme/xy.c:1.99
--- src/sys/dev/vme/xy.c:1.98 Wed Dec 31 19:52:06 2014
+++ src/sys/dev/vme/xy.c Sun Apr 26 15:15:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.98 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: xy.c,v 1.99 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.98 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.99 2015/04/26 15:15:20 mlelstv Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -243,7 +243,9 @@ struct xyc_attach_args { /* this is the
* dkdriver
*/
-struct dkdriver xydkdriver = { xystrategy };
+struct dkdriver xydkdriver = {
+ .d_strategy = xystrategy
+};
/*
* start: disk label fix code (XXX)
