Module Name: src
Committed By: jdolecek
Date: Sat Oct 7 19:52:11 UTC 2017
Modified Files:
src/sys/dev/ic: wdc_upc.c
src/sys/dev/ofisa: wdc_ofisa.c
src/sys/dev/podulebus: dtide.c hcide.c
Log Message:
adapt several more wdc attachments for NCQ branch merge
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/wdc_upc.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ofisa/wdc_ofisa.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/podulebus/dtide.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/podulebus/hcide.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_upc.c
diff -u src/sys/dev/ic/wdc_upc.c:1.29 src/sys/dev/ic/wdc_upc.c:1.30
--- src/sys/dev/ic/wdc_upc.c:1.29 Tue Jul 31 15:50:35 2012
+++ src/sys/dev/ic/wdc_upc.c Sat Oct 7 19:52:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_upc.c,v 1.29 2012/07/31 15:50:35 bouyer Exp $ */
+/* $NetBSD: wdc_upc.c,v 1.30 2017/10/07 19:52:11 jdolecek Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@@ -28,7 +28,7 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_upc.c,v 1.29 2012/07/31 15:50:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_upc.c,v 1.30 2017/10/07 19:52:11 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -51,7 +51,6 @@ struct wdc_upc_softc {
struct wdc_softc sc_wdc;
struct ata_channel *sc_chanlist[1];
struct ata_channel sc_channel;
- struct ata_queue sc_chqueue;
struct wdc_regs sc_wdc_regs;
};
@@ -88,7 +87,7 @@ wdc_upc_attach(device_t parent, device_t
wdr->ctl_ioh = ua->ua_ioh2;
sc->sc_channel.ch_channel = 0;
sc->sc_channel.ch_atac = &sc->sc_wdc.sc_atac;
- sc->sc_channel.ch_queue = &sc->sc_chqueue;
+ sc->sc_channel.ch_queue = ata_queue_alloc(1);
sc->sc_wdc.wdc_maxdrives = 2;
for (i = 0; i < WDC_NREG; i++) {
if (bus_space_subregion(ua->ua_iot, ua->ua_ioh, i,
@@ -98,7 +97,7 @@ wdc_upc_attach(device_t parent, device_t
return;
}
}
- wdc_init_shadow_regs(&sc->sc_channel);
+ wdc_init_shadow_regs(wdr);
upc_intr_establish(ua->ua_irqhandle, IPL_BIO, wdcintr,
&sc->sc_channel);
Index: src/sys/dev/ofisa/wdc_ofisa.c
diff -u src/sys/dev/ofisa/wdc_ofisa.c:1.33 src/sys/dev/ofisa/wdc_ofisa.c:1.34
--- src/sys/dev/ofisa/wdc_ofisa.c:1.33 Tue Jul 31 15:50:35 2012
+++ src/sys/dev/ofisa/wdc_ofisa.c Sat Oct 7 19:52:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_ofisa.c,v 1.33 2012/07/31 15:50:35 bouyer Exp $ */
+/* $NetBSD: wdc_ofisa.c,v 1.34 2017/10/07 19:52:11 jdolecek Exp $ */
/*
* Copyright 1997, 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.33 2012/07/31 15:50:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.34 2017/10/07 19:52:11 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -61,7 +61,6 @@ struct wdc_ofisa_softc {
struct wdc_softc sc_wdcdev;
struct ata_channel *sc_chanlist[1];
struct ata_channel sc_channel;
- struct ata_queue sc_chqueue;
struct wdc_regs wdc_regs;
void *sc_ih;
};
@@ -161,8 +160,7 @@ wdc_ofisa_attach(device_t parent, device
sc->sc_wdcdev.wdc_maxdrives = 2;
sc->sc_channel.ch_channel = 0;
sc->sc_channel.ch_atac = &sc->sc_wdcdev.sc_atac;
- sc->sc_channel.ch_queue = &sc->sc_chqueue;
-
+ sc->sc_channel.ch_queue = ata_queue_alloc(1);
wdc_init_shadow_regs(&sc->sc_channel);
wdcattach(&sc->sc_channel);
Index: src/sys/dev/podulebus/dtide.c
diff -u src/sys/dev/podulebus/dtide.c:1.28 src/sys/dev/podulebus/dtide.c:1.29
--- src/sys/dev/podulebus/dtide.c:1.28 Tue Jul 31 15:50:37 2012
+++ src/sys/dev/podulebus/dtide.c Sat Oct 7 19:52:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dtide.c,v 1.28 2012/07/31 15:50:37 bouyer Exp $ */
+/* $NetBSD: dtide.c,v 1.29 2017/10/07 19:52:11 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.28 2012/07/31 15:50:37 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.29 2017/10/07 19:52:11 jdolecek Exp $");
#include <sys/param.h>
@@ -53,7 +53,6 @@ struct dtide_softc {
struct wdc_softc sc_wdc;
struct ata_channel *sc_chp[DTIDE_NCHANNELS];/* pointers to sc_chan */
struct ata_channel sc_chan[DTIDE_NCHANNELS];
- struct ata_queue sc_chq[DTIDE_NCHANNELS];
struct wdc_regs sc_wdc_regs[DTIDE_NCHANNELS];
bus_space_tag_t sc_magict;
bus_space_handle_t sc_magich;
@@ -106,14 +105,14 @@ dtide_attach(device_t parent, device_t s
ch->ch_atac = &sc->sc_wdc.sc_atac;
wdr->cmd_iot = bst;
wdr->ctl_iot = bst;
- ch->ch_queue = &sc->sc_chq[i];
+ ch->ch_queue = ata_queue_alloc(1);
bus_space_map(pa->pa_fast_t,
pa->pa_fast_base + dtide_cmdoffsets[i], 0, 8,
&wdr->cmd_baseioh);
for (j = 0; j < WDC_NREG; j++)
bus_space_subregion(wdr->cmd_iot, wdr->cmd_baseioh,
j, j == 0 ? 4 : 1, &wdr->cmd_iohs[j]);
- wdc_init_shadow_regs(ch);
+ wdc_init_shadow_regs(wdr);
bus_space_map(pa->pa_fast_t,
pa->pa_fast_base + dtide_ctloffsets[i], 0, 8,
&wdr->ctl_ioh);
Index: src/sys/dev/podulebus/hcide.c
diff -u src/sys/dev/podulebus/hcide.c:1.25 src/sys/dev/podulebus/hcide.c:1.26
--- src/sys/dev/podulebus/hcide.c:1.25 Tue Jul 31 15:50:37 2012
+++ src/sys/dev/podulebus/hcide.c Sat Oct 7 19:52:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hcide.c,v 1.25 2012/07/31 15:50:37 bouyer Exp $ */
+/* $NetBSD: hcide.c,v 1.26 2017/10/07 19:52:11 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hcide.c,v 1.25 2012/07/31 15:50:37 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hcide.c,v 1.26 2017/10/07 19:52:11 jdolecek Exp $");
#include <sys/param.h>
@@ -52,7 +52,6 @@ struct hcide_softc {
struct wdc_softc sc_wdc;
struct ata_channel *sc_chp[HCIDE_NCHANNELS];/* pointers to sc_chan */
struct ata_channel sc_chan[HCIDE_NCHANNELS];
- struct ata_queue sc_chq[HCIDE_NCHANNELS];
struct wdc_regs sc_wdc_regs[HCIDE_NCHANNELS];
};
@@ -101,14 +100,14 @@ hcide_attach(device_t parent, device_t s
ch->ch_atac = &sc->sc_wdc.sc_atac;
wdr->cmd_iot = pa->pa_mod_t;
wdr->ctl_iot = pa->pa_mod_t;
- ch->ch_queue = &sc->sc_chq[i];
+ ch->ch_queue = ata_queue_alloc(1);
bus_space_map(pa->pa_fast_t,
pa->pa_fast_base + hcide_cmdoffsets[i], 0, 8,
&wdr->cmd_baseioh);
for (j = 0; j < WDC_NREG; j++)
bus_space_subregion(wdr->cmd_iot, wdr->cmd_baseioh,
j, j == 0 ? 4 : 1, &wdr->cmd_iohs[j]);
- wdc_init_shadow_regs(ch);
+ wdc_init_shadow_regs(wdr);
bus_space_map(pa->pa_fast_t,
pa->pa_fast_base + hcide_ctloffsets[i], 0, 8,
&wdr->ctl_ioh);
