 @@ -1,14 +1,14 @@
-/*	$NetBSD: ata_wdc.c,v 1.118 2020/05/21 09:11:33 jdolecek Exp $	*/
+/*	$NetBSD: ata_wdc.c,v 1.119 2020/12/25 08:55:40 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -44,27 +44,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.118 2020/05/21 09:11:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.119 2020/12/25 08:55:40 skrll Exp $");
 #include "opt_ata.h"
 #include "opt_wdc.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 @@ -109,36 +109,36 @@ static void	wdc_ata_bio_poll(struct ata_
 static int	wdc_ata_bio_intr(struct ata_channel *, struct ata_xfer *,
 				 int);
 static void	wdc_ata_bio_kill_xfer(struct ata_channel *,
 				      struct ata_xfer *, int);
 static void	wdc_ata_bio_done(struct ata_channel *, struct ata_xfer *);
 static int	wdc_ata_err(struct ata_drive_datas *, struct ata_bio *, int);
 #define WDC_ATA_NOERR 0x00 /* Drive doesn't report an error */
 #define WDC_ATA_RECOV 0x01 /* There was a recovered error */
 #define WDC_ATA_ERR   0x02 /* Drive reports an error */
 static int	wdc_ata_addref(struct ata_drive_datas *);
 static void	wdc_ata_delref(struct ata_drive_datas *);
 const struct ata_bustype wdc_ata_bustype = {
-	SCSIPI_BUSTYPE_ATA,
+	.bustype_type = SCSIPI_BUSTYPE_ATA,
-	wdc_ata_bio,
+	.ata_bio = wdc_ata_bio,
-	wdc_reset_drive,
+	.ata_reset_drive = wdc_reset_drive,
-	wdc_reset_channel,
+	.ata_reset_channel = wdc_reset_channel,
-	wdc_exec_command,
+	.ata_exec_command = wdc_exec_command,
-	ata_get_params,
+	.ata_get_params = ata_get_params,
-	wdc_ata_addref,
+	.ata_addref = wdc_ata_addref,
-	wdc_ata_delref,
+	.ata_delref = wdc_ata_delref,
-	ata_kill_pending,
+	.ata_killpending = ata_kill_pending,
-	NULL,
+	.ata_recovery = NULL,
 };
 static const struct ata_xfer_ops wdc_bio_xfer_ops = {
 	.c_start = wdc_ata_bio_start,
 	.c_poll = wdc_ata_bio_poll,
 	.c_abort = wdc_ata_bio_done,
 	.c_intr = wdc_ata_bio_intr,
 	.c_kill_xfer = wdc_ata_bio_kill_xfer
 };
 /*
  * Handle block I/O operation.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ahcisata_core.c,v 1.85 2020/12/20 00:14:30 jmcneill Exp $	*/
+/*	$NetBSD: ahcisata_core.c,v 1.86 2020/12/25 08:55:40 skrll Exp $	*/
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.85 2020/12/20 00:14:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.86 2020/12/25 08:55:40 skrll Exp $");
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/disklabel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <dev/ata/atareg.h>
 #include <dev/ata/satavar.h>
 #include <dev/ata/satareg.h>
 @@ -103,36 +103,36 @@ static const struct scsipi_bustype ahci_
 	.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 */
 #define ATA_DELAY 10000 /* 10s for a drive I/O */
 #define ATA_RESET_DELAY 31000 /* 31s for a drive reset */
 #define AHCI_RST_WAIT (ATA_RESET_DELAY / 10)
 const struct ata_bustype ahci_ata_bustype = {
-	SCSIPI_BUSTYPE_ATA,
+	.bustype_type = SCSIPI_BUSTYPE_ATA,
-	ahci_ata_bio,
+	.ata_bio = ahci_ata_bio,
-	ahci_reset_drive,
+	.ata_reset_drive = ahci_reset_drive,
-	ahci_reset_channel,
+	.ata_reset_channel = ahci_reset_channel,
-	ahci_exec_command,
+	.ata_exec_command = ahci_exec_command,
-	ata_get_params,
+	.ata_get_params = ata_get_params,
-	ahci_ata_addref,
+	.ata_addref = ahci_ata_addref,
-	ahci_ata_delref,
+	.ata_delref = ahci_ata_delref,
-	ahci_killpending,
+	.ata_killpending = ahci_killpending,
-	ahci_channel_recover,
+	.ata_recovery = ahci_channel_recover,
 };
 static void ahci_setup_port(struct ahci_softc *sc, int i);
 static void
 ahci_enable(struct ahci_softc *sc)
+{
 	uint32_t ghc;
 	ghc = AHCI_READ(sc, AHCI_GHC);
 	if (!(ghc & AHCI_GHC_AE)) {
 		ghc |= AHCI_GHC_AE;
 		AHCI_WRITE(sc, AHCI_GHC, ghc);