Module Name: src Committed By: maya Date: Sat Oct 27 05:35:41 UTC 2018
Modified Files: src/sys/dev/ic: wdc.c Log Message: Add missing ata_recovery struct element, NULL, same as wdc_ata_bustype in the NWD > 0 case. Build fix for the case where wd(4) is not built, reported by John D. Baker on current-users. To generate a diff of this commit: cvs rdiff -u -r1.289 -r1.290 src/sys/dev/ic/wdc.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/wdc.c diff -u src/sys/dev/ic/wdc.c:1.289 src/sys/dev/ic/wdc.c:1.290 --- src/sys/dev/ic/wdc.c:1.289 Mon Oct 22 20:13:47 2018 +++ src/sys/dev/ic/wdc.c Sat Oct 27 05:35:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: wdc.c,v 1.289 2018/10/22 20:13:47 jdolecek Exp $ */ +/* $NetBSD: wdc.c,v 1.290 2018/10/27 05:35:41 maya Exp $ */ /* * Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.289 2018/10/22 20:13:47 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.290 2018/10/27 05:35:41 maya Exp $"); #include "opt_ata.h" #include "opt_wdc.h" @@ -126,15 +126,16 @@ extern const struct ata_bustype wdc_ata_ #else /* A fake one, the autoconfig will print "wd at foo ... not configured */ const struct ata_bustype wdc_ata_bustype = { - SCSIPI_BUSTYPE_ATA, - NULL, /* wdc_ata_bio */ - NULL, /* wdc_reset_drive */ - wdc_reset_channel, - wdc_exec_command, - NULL, /* ata_get_params */ - NULL, /* wdc_ata_addref */ - NULL, /* wdc_ata_delref */ - NULL /* ata_kill_pending */ + .bus_type = SCSIPI_BUSTYPE_ATA, + .ata_bio = NULL, + .wdc_reset_drive = NULL, + .ata_reset_channel = wdc_reset_channel, + .ata_exec_command = wdc_exec_command, + .ata_get_params = NULL, + .ata_addref = NULL, + .ata_delref = NULL, + .ata_killpending = NULL, + .ata_recovery = NULL, }; #endif