[src/jdolecek-ncq]: src/sys/arch switch to ata_queue_alloc() so that this at ...

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

details:   https://anonhg.NetBSD.org/src/rev/ec32f60f9b19
branches:  jdolecek-ncq
changeset: 823036:ec32f60f9b19
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Sep 26 22:13:08 2017 +0000

description:
switch to ata_queue_alloc() so that this at least compiles

diffstat:

 sys/arch/acorn32/mainbus/wdc_pioc.c |  7 +++----
 sys/arch/amiga/dev/wdc_amiga.c      |  7 +++----
 sys/arch/landisk/dev/wdc_obio.c     |  7 +++----
 sys/arch/mac68k/obio/wdc_obio.c     |  7 +++----
 sys/arch/prep/pnpbus/wdc_pnpbus.c   |  7 +++----
 5 files changed, 15 insertions(+), 20 deletions(-)

diffs (175 lines):

diff -r 61d6de62a6eb -r ec32f60f9b19 sys/arch/acorn32/mainbus/wdc_pioc.c
--- a/sys/arch/acorn32/mainbus/wdc_pioc.c       Tue Sep 26 21:06:24 2017 +0000
+++ b/sys/arch/acorn32/mainbus/wdc_pioc.c       Tue Sep 26 22:13:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_pioc.c,v 1.28 2012/07/31 15:50:31 bouyer Exp $     */
+/*     $NetBSD: wdc_pioc.c,v 1.28.28.1 2017/09/26 22:13:08 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1997-1998 Mark Brinicombe.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pioc.c,v 1.28 2012/07/31 15:50:31 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pioc.c,v 1.28.28.1 2017/09/26 22:13:08 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,7 +60,6 @@
        struct  wdc_softc sc_wdcdev;
        struct  ata_channel *sc_chanlist[1];
        struct  ata_channel sc_channel;
-       struct  ata_queue sc_chqueue;
        struct  wdc_regs sc_wdc_regs;
        void    *sc_ih;
 };
@@ -187,7 +186,7 @@
        sc->sc_wdcdev.sc_atac.atac_nchannels = 1;
        sc->sc_wdcdev.wdc_maxdrives = 2;
        sc->sc_channel.ch_channel = 0;
-       sc->sc_channel.ch_queue = &sc->sc_chqueue;
+       sc->sc_channel.ch_queue = ata_queue_alloc(1);
 
        wdc_init_shadow_regs(&sc->sc_channel);
 
diff -r 61d6de62a6eb -r ec32f60f9b19 sys/arch/amiga/dev/wdc_amiga.c
--- a/sys/arch/amiga/dev/wdc_amiga.c    Tue Sep 26 21:06:24 2017 +0000
+++ b/sys/arch/amiga/dev/wdc_amiga.c    Tue Sep 26 22:13:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_amiga.c,v 1.38 2015/04/18 14:21:41 mlelstv Exp $ */
+/*     $NetBSD: wdc_amiga.c,v 1.38.6.1 2017/09/26 22:13:08 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.38 2015/04/18 14:21:41 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.38.6.1 2017/09/26 22:13:08 jdolecek Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -56,7 +56,6 @@
        struct wdc_softc sc_wdcdev;
        struct  ata_channel *sc_chanlist[1];
        struct  ata_channel sc_channel;
-       struct  ata_queue sc_chqueue;
        struct wdc_regs sc_wdc_regs;
        struct isr sc_isr;
        struct bus_space_tag cmd_iot;
@@ -136,7 +135,7 @@
        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);
 
diff -r 61d6de62a6eb -r ec32f60f9b19 sys/arch/landisk/dev/wdc_obio.c
--- a/sys/arch/landisk/dev/wdc_obio.c   Tue Sep 26 21:06:24 2017 +0000
+++ b/sys/arch/landisk/dev/wdc_obio.c   Tue Sep 26 22:13:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_obio.c,v 1.8 2012/07/31 15:50:32 bouyer Exp $      */
+/*     $NetBSD: wdc_obio.c,v 1.8.28.1 2017/09/26 22:13:08 jdolecek Exp $       */
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.8 2012/07/31 15:50:32 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.8.28.1 2017/09/26 22:13:08 jdolecek Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -50,7 +50,6 @@
        struct  wdc_softc sc_wdcdev;
        struct  ata_channel *sc_chanlist[1];
        struct  ata_channel sc_channel;
-       struct  ata_queue sc_chqueue;
        struct  wdc_regs sc_wdc_regs;
        void    *sc_ih;
 };
@@ -174,7 +173,7 @@
        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);
 
diff -r 61d6de62a6eb -r ec32f60f9b19 sys/arch/mac68k/obio/wdc_obio.c
--- a/sys/arch/mac68k/obio/wdc_obio.c   Tue Sep 26 21:06:24 2017 +0000
+++ b/sys/arch/mac68k/obio/wdc_obio.c   Tue Sep 26 22:13:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_obio.c,v 1.27 2013/10/25 21:50:28 martin Exp $ */
+/*     $NetBSD: wdc_obio.c,v 1.27.18.1 2017/09/26 22:13:08 jdolecek Exp $ */
 
 /*
  * Copyright (c) 2002 Takeshi Shibagaki  All rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.27 2013/10/25 21:50:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.27.18.1 2017/09/26 22:13:08 jdolecek Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -68,7 +68,6 @@
        struct  wdc_softc sc_wdcdev;
        struct  ata_channel *sc_chanlist[1];
        struct  ata_channel sc_channel;
-       struct  ata_queue sc_chqueue;
        struct  wdc_regs sc_wdc_regs;
        void    *sc_ih;
 };
@@ -223,7 +222,7 @@
        sc->sc_wdcdev.wdc_maxdrives = 2;
        chp->ch_channel = 0;
        chp->ch_atac = &sc->sc_wdcdev.sc_atac;
-       chp->ch_queue = &sc->sc_chqueue;
+       chp->ch_queue = ata_queue_alloc(1);
        wdc_init_shadow_regs(chp);
 
        aprint_normal("\n");
diff -r 61d6de62a6eb -r ec32f60f9b19 sys/arch/prep/pnpbus/wdc_pnpbus.c
--- a/sys/arch/prep/pnpbus/wdc_pnpbus.c Tue Sep 26 21:06:24 2017 +0000
+++ b/sys/arch/prep/pnpbus/wdc_pnpbus.c Tue Sep 26 22:13:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_pnpbus.c,v 1.13 2012/07/31 15:50:33 bouyer Exp $   */
+/*     $NetBSD: wdc_pnpbus.c,v 1.13.28.1 2017/09/26 22:13:08 jdolecek Exp $    */
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.13 2012/07/31 15:50:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.13.28.1 2017/09/26 22:13:08 jdolecek Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -55,7 +55,6 @@
        struct  wdc_softc sc_wdcdev;
        struct  ata_channel *sc_chanlist[1];
        struct  ata_channel sc_channel;
-       struct  ata_queue sc_chqueue;
        struct  wdc_regs sc_wdc_regs;
        void    *sc_ih;
 };
@@ -141,7 +140,7 @@
        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);
 
        sc->sc_ih = pnpbus_intr_establish(0, IPL_BIO, IST_PNP,