CVS commit: [jdolecek-ncq] src/sys/dev/ata

[Jaromir Dolecek]

Module Name:    src
Committed By:   jdolecek
Date:           Tue Sep 26 20:15:36 UTC 2017

Modified Files:
        src/sys/dev/ata [jdolecek-ncq]: ata_wdc.c atavar.h

Log Message:
make compile without NATA_DMA


To generate a diff of this commit:
cvs rdiff -u -r1.105.6.10 -r1.105.6.11 src/sys/dev/ata/ata_wdc.c
cvs rdiff -u -r1.92.8.26 -r1.92.8.27 src/sys/dev/ata/atavar.h

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/ata/ata_wdc.c
diff -u src/sys/dev/ata/ata_wdc.c:1.105.6.10 src/sys/dev/ata/ata_wdc.c:1.105.6.11
--- src/sys/dev/ata/ata_wdc.c:1.105.6.10	Thu Sep 21 18:47:21 2017
+++ src/sys/dev/ata/ata_wdc.c	Tue Sep 26 20:15:36 2017
@@ -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 @@ _wdc_ata_bio_start(struct ata_channel *c
 	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",

Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.92.8.26 src/sys/dev/ata/atavar.h:1.92.8.27
--- src/sys/dev/ata/atavar.h:1.92.8.26	Tue Sep 19 21:06:25 2017
+++ src/sys/dev/ata/atavar.h	Tue Sep 26 20:15:36 2017
@@ -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 @@ struct ata_drive_datas {
 #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;