From 46f3d27a6d13a3fc18fdc6d495942388546ee492 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Sat, 7 Oct 2017 20:02:07 +0000 Subject: [PATCH] adapt for NCQ branch merge too --- sys/dev/isapnp/wdc_isapnp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/isapnp/wdc_isapnp.c b/sys/dev/isapnp/wdc_isapnp.c index cfcc394220b9..5dec27b9130d 100644 --- a/sys/dev/isapnp/wdc_isapnp.c +++ b/sys/dev/isapnp/wdc_isapnp.c @@ -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 -__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 #include @@ -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, device_t self, void *aux) 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); }