Module Name: src
Committed By: jdolecek
Date: Tue Apr 11 18:15:03 UTC 2017
Modified Files:
src/sys/dev/ata [jdolecek-ncq]: ata.c atavar.h
Log Message:
hide active_xfer from drivers
To generate a diff of this commit:
cvs rdiff -u -r1.132.8.1 -r1.132.8.2 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.92.8.1 -r1.92.8.2 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.c
diff -u src/sys/dev/ata/ata.c:1.132.8.1 src/sys/dev/ata/ata.c:1.132.8.2
--- src/sys/dev/ata/ata.c:1.132.8.1 Mon Apr 10 22:57:02 2017
+++ src/sys/dev/ata/ata.c Tue Apr 11 18:15:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.132.8.1 2017/04/10 22:57:02 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.132.8.2 2017/04/11 18:15:03 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.1 2017/04/10 22:57:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.2 2017/04/11 18:15:03 jdolecek Exp $");
#include "opt_ata.h"
@@ -46,6 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.13
#include <sys/bus.h>
#include <sys/once.h>
+#define ATABUS_PRIVATE
+
#include <dev/ata/ataconf.h>
#include <dev/ata/atareg.h>
#include <dev/ata/atavar.h>
Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.92.8.1 src/sys/dev/ata/atavar.h:1.92.8.2
--- src/sys/dev/ata/atavar.h:1.92.8.1 Mon Apr 10 22:57:02 2017
+++ src/sys/dev/ata/atavar.h Tue Apr 11 18:15:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.92.8.1 2017/04/10 22:57:02 jdolecek Exp $ */
+/* $NetBSD: atavar.h,v 1.92.8.2 2017/04/11 18:15:03 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -88,7 +88,9 @@ struct ata_queue {
#define QF_SHARED 0x02 /* this queue is shared */
int queue_active; /* number of active transfers */
int queue_openings; /* max number of active transfers */
+#ifdef ATABUS_PRIVATE
struct ata_xfer *active_xfers[1]; /* active command */
+#endif
};
/* ATA bus instance state information. */
