adapt for NCQ branch merge too

This commit is contained in:
jdolecek 2017-10-07 20:02:07 +00:00
parent ffc46dc0fe
commit 46f3d27a6d
1 changed files with 4 additions and 6 deletions

View File

@ -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, 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);
}