Module Name: src
Committed By: riastradh
Date: Wed Feb 19 16:04:40 UTC 2020
Modified Files:
src/sys/dev/ic: ahcisata_core.c mvsata.c siisata.c
src/sys/dev/scsipi: atapi_wdc.c scsiconf.c
src/sys/dev/usb: umass_scsipi.c
Log Message:
C99 initializers for scsipi_bustype. No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/scsipi/atapi_wdc.c
cvs rdiff -u -r1.285 -r1.286 src/sys/dev/scsipi/scsiconf.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/umass_scsipi.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/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.81 src/sys/dev/ic/ahcisata_core.c:1.82
--- src/sys/dev/ic/ahcisata_core.c:1.81 Sat Jan 18 11:26:11 2020
+++ src/sys/dev/ic/ahcisata_core.c Wed Feb 19 16:04:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.81 2020/01/18 11:26:11 simonb Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.82 2020/02/19 16:04:39 riastradh Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.81 2020/01/18 11:26:11 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.82 2020/02/19 16:04:39 riastradh Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -99,12 +99,12 @@ static void ahci_atapi_kill_xfer(struct
static void ahci_atapi_probe_device(struct atapibus_softc *, int);
static const struct scsipi_bustype ahci_atapi_bustype = {
- SCSIPI_BUSTYPE_ATAPI,
- atapi_scsipi_cmd,
- atapi_interpret_sense,
- atapi_print_addr,
- ahci_atapi_kill_pending,
- NULL,
+ .bustype_type = SCSIPI_BUSTYPE_ATAPI,
+ .bustype_cmd = atapi_scsipi_cmd,
+ .bustype_interpret_sense = atapi_interpret_sense,
+ .bustype_printaddr = atapi_print_addr,
+ .bustype_kill_pending = ahci_atapi_kill_pending,
+ .bustype_async_event_xfer_mode = NULL,
};
#endif /* NATAPIBUS */
Index: src/sys/dev/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.52 src/sys/dev/ic/mvsata.c:1.53
--- src/sys/dev/ic/mvsata.c:1.52 Fri Dec 27 09:41:50 2019
+++ src/sys/dev/ic/mvsata.c Wed Feb 19 16:04:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.52 2019/12/27 09:41:50 msaitoh Exp $ */
+/* $NetBSD: mvsata.c,v 1.53 2020/02/19 16:04:39 riastradh Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.52 2019/12/27 09:41:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.53 2020/02/19 16:04:39 riastradh Exp $");
#include "opt_mvsata.h"
@@ -235,12 +235,12 @@ static const struct ata_bustype mvsata_a
#if NATAPIBUS > 0
static const struct scsipi_bustype mvsata_atapi_bustype = {
- SCSIPI_BUSTYPE_ATAPI,
- atapi_scsipi_cmd,
- atapi_interpret_sense,
- atapi_print_addr,
- mvsata_atapi_kill_pending,
- NULL,
+ .bustype_type = SCSIPI_BUSTYPE_ATAPI,
+ .bustype_cmd = atapi_scsipi_cmd,
+ .bustype_interpret_sense = atapi_interpret_sense,
+ .bustype_printaddr = atapi_print_addr,
+ .bustype_kill_pending = mvsata_atapi_kill_pending,
+ .bustype_async_event_xfer_mode = NULL,
};
#endif /* NATAPIBUS */
#endif
Index: src/sys/dev/ic/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.40 src/sys/dev/ic/siisata.c:1.41
--- src/sys/dev/ic/siisata.c:1.40 Sun Nov 10 21:16:35 2019
+++ src/sys/dev/ic/siisata.c Wed Feb 19 16:04:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.40 2019/11/10 21:16:35 chs Exp $ */
+/* $NetBSD: siisata.c,v 1.41 2020/02/19 16:04:39 riastradh Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.40 2019/11/10 21:16:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.41 2020/02/19 16:04:39 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -198,12 +198,12 @@ const struct ata_bustype siisata_ata_bus
#if NATAPIBUS > 0
static const struct scsipi_bustype siisata_atapi_bustype = {
- SCSIPI_BUSTYPE_ATAPI,
- atapi_scsipi_cmd,
- atapi_interpret_sense,
- atapi_print_addr,
- siisata_atapi_kill_pending,
- NULL,
+ .bustype_type = SCSIPI_BUSTYPE_ATAPI,
+ .bustype_cmd = atapi_scsipi_cmd,
+ .bustype_interpret_sense = atapi_interpret_sense,
+ .bustype_printaddr = atapi_print_addr,
+ .bustype_kill_pending = siisata_atapi_kill_pending,
+ .bustype_async_event_xfer_mode = NULL,
};
#endif /* NATAPIBUS */
Index: src/sys/dev/scsipi/atapi_wdc.c
diff -u src/sys/dev/scsipi/atapi_wdc.c:1.135 src/sys/dev/scsipi/atapi_wdc.c:1.136
--- src/sys/dev/scsipi/atapi_wdc.c:1.135 Wed Feb 12 00:19:07 2020
+++ src/sys/dev/scsipi/atapi_wdc.c Wed Feb 19 16:04:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_wdc.c,v 1.135 2020/02/12 00:19:07 chs Exp $ */
+/* $NetBSD: atapi_wdc.c,v 1.136 2020/02/19 16:04:39 riastradh Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.135 2020/02/12 00:19:07 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.136 2020/02/19 16:04:39 riastradh Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -101,12 +101,12 @@ static void wdc_atapi_polldsc(void *arg)
#define MAX_SIZE MAXPHYS
static const struct scsipi_bustype wdc_atapi_bustype = {
- SCSIPI_BUSTYPE_ATAPI,
- atapi_scsipi_cmd,
- atapi_interpret_sense,
- atapi_print_addr,
- wdc_atapi_kill_pending,
- NULL,
+ .bustype_type = SCSIPI_BUSTYPE_ATAPI,
+ .bustype_cmd = atapi_scsipi_cmd,
+ .bustype_interpret_sense = atapi_interpret_sense,
+ .bustype_printaddr = atapi_print_addr,
+ .bustype_kill_pending = wdc_atapi_kill_pending,
+ .bustype_async_event_xfer_mode = NULL,
};
void
Index: src/sys/dev/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.285 src/sys/dev/scsipi/scsiconf.c:1.286
--- src/sys/dev/scsipi/scsiconf.c:1.285 Sun Nov 10 21:16:37 2019
+++ src/sys/dev/scsipi/scsiconf.c Wed Feb 19 16:04:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.285 2019/11/10 21:16:37 chs Exp $ */
+/* $NetBSD: scsiconf.c,v 1.286 2020/02/19 16:04:39 riastradh 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.285 2019/11/10 21:16:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.286 2020/02/19 16:04:39 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,39 +126,43 @@ static void scsibus_discover_thread(void
static void scsibus_config(struct scsibus_softc *);
const struct scsipi_bustype scsi_bustype = {
- SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_PSCSI),
- scsi_scsipi_cmd,
- scsipi_interpret_sense,
- scsi_print_addr,
- scsi_kill_pending,
- scsi_async_event_xfer_mode,
+ .bustype_type = SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI,
+ SCSIPI_BUSTYPE_SCSI_PSCSI),
+ .bustype_cmd = scsi_scsipi_cmd,
+ .bustype_interpret_sense = scsipi_interpret_sense,
+ .bustype_printaddr = scsi_print_addr,
+ .bustype_kill_pending = scsi_kill_pending,
+ .bustype_async_event_xfer_mode = scsi_async_event_xfer_mode,
};
const struct scsipi_bustype scsi_fc_bustype = {
- SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_FC),
- scsi_scsipi_cmd,
- scsipi_interpret_sense,
- scsi_print_addr,
- scsi_kill_pending,
- scsi_fc_sas_async_event_xfer_mode,
+ .bustype_type = SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI,
+ SCSIPI_BUSTYPE_SCSI_FC),
+ .bustype_cmd = scsi_scsipi_cmd,
+ .bustype_interpret_sense = scsipi_interpret_sense,
+ .bustype_printaddr = scsi_print_addr,
+ .bustype_kill_pending = scsi_kill_pending,
+ .bustype_async_event_xfer_mode = scsi_fc_sas_async_event_xfer_mode,
};
const struct scsipi_bustype scsi_sas_bustype = {
- SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_SAS),
- scsi_scsipi_cmd,
- scsipi_interpret_sense,
- scsi_print_addr,
- scsi_kill_pending,
- scsi_fc_sas_async_event_xfer_mode,
+ .bustype_type = SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI,
+ SCSIPI_BUSTYPE_SCSI_SAS),
+ .bustype_cmd = scsi_scsipi_cmd,
+ .bustype_interpret_sense = scsipi_interpret_sense,
+ .bustype_printaddr = scsi_print_addr,
+ .bustype_kill_pending = scsi_kill_pending,
+ .bustype_async_event_xfer_mode = scsi_fc_sas_async_event_xfer_mode,
};
const struct scsipi_bustype scsi_usb_bustype = {
- SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_USB),
- scsi_scsipi_cmd,
- scsipi_interpret_sense,
- scsi_print_addr,
- scsi_kill_pending,
- NULL,
+ .bustype_type = SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI,
+ SCSIPI_BUSTYPE_SCSI_USB),
+ .bustype_cmd = scsi_scsipi_cmd,
+ .bustype_interpret_sense = scsipi_interpret_sense,
+ .bustype_printaddr = scsi_print_addr,
+ .bustype_kill_pending = scsi_kill_pending,
+ .bustype_async_event_xfer_mode = NULL,
};
static int
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.63 src/sys/dev/usb/umass_scsipi.c:1.64
--- src/sys/dev/usb/umass_scsipi.c:1.63 Sun Nov 10 21:16:38 2019
+++ src/sys/dev/usb/umass_scsipi.c Wed Feb 19 16:04:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.63 2019/11/10 21:16:38 chs Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.64 2020/02/19 16:04:40 riastradh Exp $ */
/*
* Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.63 2019/11/10 21:16:38 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.64 2020/02/19 16:04:40 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -112,12 +112,12 @@ Static struct umass_scsipi_softc *umass_
Static void umass_atapi_probe_device(struct atapibus_softc *, int);
const struct scsipi_bustype umass_atapi_bustype = {
- SCSIPI_BUSTYPE_ATAPI,
- atapi_scsipi_cmd,
- atapi_interpret_sense,
- atapi_print_addr,
- scsi_kill_pending,
- NULL,
+ .bustype_type = SCSIPI_BUSTYPE_ATAPI,
+ .bustype_cmd = atapi_scsipi_cmd,
+ .bustype_interpret_sense = atapi_interpret_sense,
+ .bustype_printaddr = atapi_print_addr,
+ .bustype_kill_pending = scsi_kill_pending,
+ .bustype_async_event_xfer_mode = NULL,
};
#endif
