[src/jdolecek-ncq]: src/sys/dev/ata make compile without NATA_DMA

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

details:   https://anonhg.NetBSD.org/src/rev/f3b19ac69848
branches:  jdolecek-ncq
changeset: 352783:f3b19ac69848
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Sep 26 20:15:36 2017 +0000

description:
make compile without NATA_DMA

diffstat:

 sys/dev/ata/ata_wdc.c |  8 ++++----
 sys/dev/ata/atavar.h  |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 162d8d1557f7 -r f3b19ac69848 sys/dev/ata/ata_wdc.c
--- a/sys/dev/ata/ata_wdc.c     Tue Sep 26 17:05:37 2017 +0000
+++ b/sys/dev/ata/ata_wdc.c     Tue Sep 26 20:15:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ata_wdc.c,v 1.105.6.10 2017/09/21 18:47:21 jdolecek Exp $      */
+/*     $NetBSD: ata_wdc.c,v 1.105.6.11 2017/09/26 20:15:36 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.105.6.10 2017/09/21 18:47:21 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.105.6.11 2017/09/26 20:15:36 jdolecek Exp $");
 
 #include "opt_ata.h"
 #include "opt_wdc.h"
@@ -340,9 +340,9 @@
        int wait_flags = (xfer->c_flags & C_POLL) ? AT_POLL : 0;
        uint16_t cyl;
        uint8_t head, sect, cmd = 0;
-       int nblks;
+       int nblks, tfd;
 #if NATA_DMA || NATA_PIOBM
-       int error, dma_flags = 0, tfd;
+       int error, dma_flags = 0;
 #endif
 
        ATADEBUG_PRINT(("_wdc_ata_bio_start %s:%d:%d\n",
diff -r 162d8d1557f7 -r f3b19ac69848 sys/dev/ata/atavar.h
--- a/sys/dev/ata/atavar.h      Tue Sep 26 17:05:37 2017 +0000
+++ b/sys/dev/ata/atavar.h      Tue Sep 26 20:15:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atavar.h,v 1.92.8.26 2017/09/19 21:06:25 jdolecek Exp $        */
+/*     $NetBSD: atavar.h,v 1.92.8.27 2017/09/26 20:15:36 jdolecek Exp $        */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -304,9 +304,9 @@
 #define RESET          0
 #define READY          1
 
-#if NATA_DMA
        uint8_t drv_openings;           /* # of command tags */
 
+#if NATA_DMA
        /* numbers of xfers and DMA errs. Used by ata_dmaerr() */
        uint8_t n_dmaerrs;
        uint32_t n_xfers;