Module Name: src
Committed By: jdolecek
Date: Sat Oct 7 19:58:54 UTC 2017
Modified Files:
src/sys/arch/arm/gemini: obio_wdc.c
src/sys/arch/dreamcast/dev/g1: wdc_g1.c
src/sys/arch/evbarm/iq31244: wdc_obio.c
src/sys/arch/evbarm/tsarm: wdc_ts.c
src/sys/arch/evbppc/mpc85xx: wdc_obio.c
src/sys/arch/mmeye/dev: wdc_mainbus.c
Log Message:
adapt the rest of wdc attachments for NCQ branch merge
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/gemini/obio_wdc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/dreamcast/dev/g1/wdc_g1.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/iq31244/wdc_obio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/tsarm/wdc_ts.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/mpc85xx/wdc_obio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mmeye/dev/wdc_mainbus.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/arch/arm/gemini/obio_wdc.c
diff -u src/sys/arch/arm/gemini/obio_wdc.c:1.6 src/sys/arch/arm/gemini/obio_wdc.c:1.7
--- src/sys/arch/arm/gemini/obio_wdc.c:1.6 Tue Jul 31 15:50:31 2012
+++ src/sys/arch/arm/gemini/obio_wdc.c Sat Oct 7 19:58:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_wdc.c,v 1.6 2012/07/31 15:50:31 bouyer Exp $ */
+/* $NetBSD: obio_wdc.c,v 1.7 2017/10/07 19:58:53 jdolecek Exp $ */
/* adapted from iq31244/wdc_obio.c:
* NetBSD: wdc_obio.c,v 1.5 2008/04/28 20:23:16 martin Exp
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_wdc.c,v 1.6 2012/07/31 15:50:31 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_wdc.c,v 1.7 2017/10/07 19:58:53 jdolecek Exp $");
#include "locators.h"
@@ -58,7 +58,6 @@ struct wdc_obio_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;
void *sc_ih;
};
@@ -141,8 +140,8 @@ wdc_obio_attach(device_t parent, device_
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);
aprint_normal("\n");
Index: src/sys/arch/dreamcast/dev/g1/wdc_g1.c
diff -u src/sys/arch/dreamcast/dev/g1/wdc_g1.c:1.1 src/sys/arch/dreamcast/dev/g1/wdc_g1.c:1.2
--- src/sys/arch/dreamcast/dev/g1/wdc_g1.c:1.1 Thu Dec 29 11:49:05 2016
+++ src/sys/arch/dreamcast/dev/g1/wdc_g1.c Sat Oct 7 19:58:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_g1.c,v 1.1 2016/12/29 11:49:05 tsutsui Exp $ */
+/* $NetBSD: wdc_g1.c,v 1.2 2017/10/07 19:58:53 jdolecek Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -55,7 +55,6 @@ struct wdc_g1_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;
void *sc_ih;
int sc_irq;
@@ -164,8 +163,8 @@ wdc_g1_attach(struct device *parent, str
sc->sc_wdcdev.reset = wdc_g1_do_reset;
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);
aprint_normal(": %s\n", sysasic_intr_string(SYSASIC_IRL9));
Index: src/sys/arch/evbarm/iq31244/wdc_obio.c
diff -u src/sys/arch/evbarm/iq31244/wdc_obio.c:1.9 src/sys/arch/evbarm/iq31244/wdc_obio.c:1.10
--- src/sys/arch/evbarm/iq31244/wdc_obio.c:1.9 Tue Jul 31 15:50:32 2012
+++ src/sys/arch/evbarm/iq31244/wdc_obio.c Sat Oct 7 19:58:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_obio.c,v 1.9 2012/07/31 15:50:32 bouyer Exp $ */
+/* $NetBSD: wdc_obio.c,v 1.10 2017/10/07 19:58:53 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 2003, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.9 2012/07/31 15:50:32 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.10 2017/10/07 19:58:53 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,6 @@ struct wdc_obio_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;
void *sc_ih;
};
@@ -112,8 +111,8 @@ wdc_obio_attach(device_t parent, device_
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);
aprint_normal("\n");
Index: src/sys/arch/evbarm/tsarm/wdc_ts.c
diff -u src/sys/arch/evbarm/tsarm/wdc_ts.c:1.9 src/sys/arch/evbarm/tsarm/wdc_ts.c:1.10
--- src/sys/arch/evbarm/tsarm/wdc_ts.c:1.9 Tue Jul 31 15:50:32 2012
+++ src/sys/arch/evbarm/tsarm/wdc_ts.c Sat Oct 7 19:58:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_ts.c,v 1.9 2012/07/31 15:50:32 bouyer Exp $ */
+/* $NetBSD: wdc_ts.c,v 1.10 2017/10/07 19:58:53 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_ts.c,v 1.9 2012/07/31 15:50:32 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_ts.c,v 1.10 2017/10/07 19:58:53 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,6 @@ struct wdc_ts_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;
void *sc_ih;
};
@@ -110,8 +109,8 @@ wdc_ts_attach(device_t parent, device_t
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);
aprint_normal("\n");
Index: src/sys/arch/evbppc/mpc85xx/wdc_obio.c
diff -u src/sys/arch/evbppc/mpc85xx/wdc_obio.c:1.4 src/sys/arch/evbppc/mpc85xx/wdc_obio.c:1.5
--- src/sys/arch/evbppc/mpc85xx/wdc_obio.c:1.4 Tue Jul 31 15:50:32 2012
+++ src/sys/arch/evbppc/mpc85xx/wdc_obio.c Sat Oct 7 19:58:54 2017
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.4 2012/07/31 15:50:32 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.5 2017/10/07 19:58:54 jdolecek Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -53,7 +53,6 @@ struct wdc_obio_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;
void *sc_ih;
};
@@ -162,9 +161,8 @@ wdc_obio_attach(device_t parent, device_
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);
/*
Index: src/sys/arch/mmeye/dev/wdc_mainbus.c
diff -u src/sys/arch/mmeye/dev/wdc_mainbus.c:1.4 src/sys/arch/mmeye/dev/wdc_mainbus.c:1.5
--- src/sys/arch/mmeye/dev/wdc_mainbus.c:1.4 Tue Jul 31 15:50:33 2012
+++ src/sys/arch/mmeye/dev/wdc_mainbus.c Sat Oct 7 19:58:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_mainbus.c,v 1.4 2012/07/31 15:50:33 bouyer Exp $ */
+/* $NetBSD: wdc_mainbus.c,v 1.5 2017/10/07 19:58:54 jdolecek Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_mainbus.c,v 1.4 2012/07/31 15:50:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_mainbus.c,v 1.5 2017/10/07 19:58:54 jdolecek Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -57,7 +57,6 @@ struct wdc_mainbus_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;
};
@@ -173,8 +172,8 @@ wdc_mainbus_attach(device_t parent, devi
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);
aprint_normal("\n");
