[src/trunk]: src/sys/arch adapt the rest of wdc attachments for NCQ branch merge

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

details:   https://anonhg.NetBSD.org/src/rev/5eb2a7a4024c
branches:  trunk
changeset: 356670:5eb2a7a4024c
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Oct 07 19:58:53 2017 +0000

description:
adapt the rest of wdc attachments for NCQ branch merge

diffstat:

 sys/arch/arm/gemini/obio_wdc.c     |  9 ++++-----
 sys/arch/dreamcast/dev/g1/wdc_g1.c |  7 +++----
 sys/arch/evbarm/iq31244/wdc_obio.c |  9 ++++-----
 sys/arch/evbarm/tsarm/wdc_ts.c     |  9 ++++-----
 sys/arch/evbppc/mpc85xx/wdc_obio.c |  8 +++-----
 sys/arch/mmeye/dev/wdc_mainbus.c   |  9 ++++-----
 6 files changed, 22 insertions(+), 29 deletions(-)

diffs (208 lines):

diff -r 6033a86675e2 -r 5eb2a7a4024c sys/arch/arm/gemini/obio_wdc.c
--- a/sys/arch/arm/gemini/obio_wdc.c    Sat Oct 07 19:52:11 2017 +0000
+++ b/sys/arch/arm/gemini/obio_wdc.c    Sat Oct 07 19:58:53 2017 +0000
@@ -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_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 @@
        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");
 
diff -r 6033a86675e2 -r 5eb2a7a4024c sys/arch/dreamcast/dev/g1/wdc_g1.c
--- a/sys/arch/dreamcast/dev/g1/wdc_g1.c        Sat Oct 07 19:52:11 2017 +0000
+++ b/sys/arch/dreamcast/dev/g1/wdc_g1.c        Sat Oct 07 19:58:53 2017 +0000
@@ -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_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 @@
        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));
 
diff -r 6033a86675e2 -r 5eb2a7a4024c sys/arch/evbarm/iq31244/wdc_obio.c
--- a/sys/arch/evbarm/iq31244/wdc_obio.c        Sat Oct 07 19:52:11 2017 +0000
+++ b/sys/arch/evbarm/iq31244/wdc_obio.c        Sat Oct 07 19:58:53 2017 +0000
@@ -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_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 @@
        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");
 
diff -r 6033a86675e2 -r 5eb2a7a4024c sys/arch/evbarm/tsarm/wdc_ts.c
--- a/sys/arch/evbarm/tsarm/wdc_ts.c    Sat Oct 07 19:52:11 2017 +0000
+++ b/sys/arch/evbarm/tsarm/wdc_ts.c    Sat Oct 07 19:58:53 2017 +0000
@@ -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_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 @@
        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");
 
diff -r 6033a86675e2 -r 5eb2a7a4024c sys/arch/evbppc/mpc85xx/wdc_obio.c
--- a/sys/arch/evbppc/mpc85xx/wdc_obio.c        Sat Oct 07 19:52:11 2017 +0000
+++ b/sys/arch/evbppc/mpc85xx/wdc_obio.c        Sat Oct 07 19:58:53 2017 +0000
@@ -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_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 @@
        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);
 
 
        /* 
diff -r 6033a86675e2 -r 5eb2a7a4024c sys/arch/mmeye/dev/wdc_mainbus.c
--- a/sys/arch/mmeye/dev/wdc_mainbus.c  Sat Oct 07 19:52:11 2017 +0000
+++ b/sys/arch/mmeye/dev/wdc_mainbus.c  Sat Oct 07 19:58:53 2017 +0000
@@ -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_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 @@
        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");