[src/trunk]: src/sys/dev/isapnp adapt for NCQ branch merge too

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/31d49875e271
branches:  trunk
changeset: 356671:31d49875e271
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Oct 07 20:02:07 2017 +0000

description:
adapt for NCQ branch merge too

diffstat:

 sys/dev/isapnp/wdc_isapnp.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 5eb2a7a4024c -r 31d49875e271 sys/dev/isapnp/wdc_isapnp.c
--- a/sys/dev/isapnp/wdc_isapnp.c       Sat Oct 07 19:58:53 2017 +0000
+++ b/sys/dev/isapnp/wdc_isapnp.c       Sat Oct 07 20:02:07 2017 +0000
@@ -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_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 @@
        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);
 }