Module Name: src
Committed By: jdolecek
Date: Sat Oct 7 20:02:07 UTC 2017
Modified Files:
src/sys/dev/isapnp: wdc_isapnp.c
Log Message:
adapt for NCQ branch merge too
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/isapnp/wdc_isapnp.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/isapnp/wdc_isapnp.c
diff -u src/sys/dev/isapnp/wdc_isapnp.c:1.42 src/sys/dev/isapnp/wdc_isapnp.c:1.43
--- src/sys/dev/isapnp/wdc_isapnp.c:1.42 Tue Jul 31 15:50:35 2012
+++ src/sys/dev/isapnp/wdc_isapnp.c Sat Oct 7 20:02:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_isapnp.c,v 1.42 2012/07/31 15:50:35 bouyer Exp $ */
+/* $NetBSD: wdc_isapnp.c,v 1.43 2017/10/07 20:02:07 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.42 2012/07/31 15:50:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.43 2017/10/07 20:02:07 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,7 +55,6 @@ struct wdc_isapnp_softc {
struct wdc_softc sc_wdcdev;
struct ata_channel *wdc_chanlist[1];
struct ata_channel ata_channel;
- struct ata_queue wdc_chqueue;
struct wdc_regs wdc_regs;
isa_chipset_tag_t sc_ic;
void *sc_ih;
@@ -159,9 +158,8 @@ wdc_isapnp_attach(device_t parent, devic
sc->sc_wdcdev.wdc_maxdrives = 2;
sc->ata_channel.ch_channel = 0;
sc->ata_channel.ch_atac = &sc->sc_wdcdev.sc_atac;
- sc->ata_channel.ch_queue = &sc->wdc_chqueue;
-
- wdc_init_shadow_regs(&sc->ata_channel);
+ sc->ata_channel.ch_queue = ata_queue_alloc(1);
+ wdc_init_shadow_regs(wdr);
wdcattach(&sc->ata_channel);
}
