From 6bd0c9f44d4efd002f181875a9c8756c6661fe8e Mon Sep 17 00:00:00 2001
From: fvdl <fvdl@NetBSD.org>
Date: Mon, 5 May 2003 12:55:41 +0000
Subject: [PATCH] Move definition of ISA_DMA_BOUNCE_THRESHOLD to
 dev/isa/isareg.h.

---
 sys/arch/algor/isa/isadma_bounce.c      | 7 +------
 sys/arch/alpha/isa/isadma_bounce.c      | 9 ++-------
 sys/arch/arc/isa/isadma_bounce.c        | 9 ++-------
 sys/arch/atari/isa/isa_dma.c            | 7 +------
 sys/arch/bebox/isa/isadma_machdep.c     | 7 +------
 sys/arch/evbmips/isa/isadma_bounce.c    | 7 +------
 sys/arch/mvmeppc/isa/isadma_machdep.c   | 7 +------
 sys/arch/prep/isa/isadma_machdep.c      | 7 +------
 sys/arch/sandpoint/isa/isadma_machdep.c | 7 +------
 sys/arch/x86/isa/isa_machdep.c          | 9 ++-------
 sys/dev/isa/isareg.h                    | 8 +++++++-
 11 files changed, 20 insertions(+), 64 deletions(-)

diff --git a/sys/arch/algor/isa/isadma_bounce.c b/sys/arch/algor/isa/isadma_bounce.c
index bfd3e3e08b99..d06cb57be094 100644
--- a/sys/arch/algor/isa/isadma_bounce.c
+++ b/sys/arch/algor/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_bounce.c,v 1.2 2001/11/14 18:15:12 thorpej Exp $	*/
+/*	$NetBSD: isadma_bounce.c,v 1.3 2003/05/05 12:55:41 fvdl Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -58,11 +58,6 @@
 
 extern	paddr_t avail_end;
 
-/*
- * ISA can only DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 /*
  * Cookie used by bouncing ISA DMA.  A pointer to one of these is stashed
  * in the DMA map.
diff --git a/sys/arch/alpha/isa/isadma_bounce.c b/sys/arch/alpha/isa/isadma_bounce.c
index 991998da4829..43748b1412f7 100644
--- a/sys/arch/alpha/isa/isadma_bounce.c
+++ b/sys/arch/alpha/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.4 2002/04/26 04:15:19 thorpej Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.5 2003/05/05 12:55:42 fvdl Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.4 2002/04/26 04:15:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.5 2003/05/05 12:55:42 fvdl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,11 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.4 2002/04/26 04:15:19 thorpej Ex
 
 extern	paddr_t avail_end;
 
-/*
- * ISA can only DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 /*
  * Cookie used by bouncing ISA DMA.  A pointer to one of these is stashed
  * in the DMA map.
diff --git a/sys/arch/arc/isa/isadma_bounce.c b/sys/arch/arc/isa/isadma_bounce.c
index b90153b0205a..47460ee6cd73 100644
--- a/sys/arch/arc/isa/isadma_bounce.c
+++ b/sys/arch/arc/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.5 2003/01/19 10:06:14 tsutsui Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.6 2003/05/05 12:55:42 fvdl Exp $ */
 /* NetBSD: isadma_bounce.c,v 1.2 2000/06/01 05:49:36 thorpej Exp  */
 
 /*-
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.5 2003/01/19 10:06:14 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.6 2003/05/05 12:55:42 fvdl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,11 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.5 2003/01/19 10:06:14 tsutsui Ex
 
 extern paddr_t avail_end;	/* from pmap.c */
 
-/*
- * ISA can only DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 /*
  * Cookie used by bouncing ISA DMA.  A pointer to one of these is stashed
  * in the DMA map.
diff --git a/sys/arch/atari/isa/isa_dma.c b/sys/arch/atari/isa/isa_dma.c
index 8dda5722796d..65f488a0928d 100644
--- a/sys/arch/atari/isa/isa_dma.c
+++ b/sys/arch/atari/isa/isa_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_dma.c,v 1.1 2001/03/09 20:55:47 leo Exp $	*/
+/*	$NetBSD: isa_dma.c,v 1.2 2003/05/05 12:55:42 fvdl Exp $	*/
 
 #define ISA_DMA_STATS
 
@@ -55,11 +55,6 @@
 
 #include <uvm/uvm_extern.h>
 
-/*
- * ISA can only DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 extern	paddr_t avail_end;
 
 /*
diff --git a/sys/arch/bebox/isa/isadma_machdep.c b/sys/arch/bebox/isa/isadma_machdep.c
index f98213898efd..dbe246aff90d 100644
--- a/sys/arch/bebox/isa/isadma_machdep.c
+++ b/sys/arch/bebox/isa/isadma_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_machdep.c,v 1.20 2003/04/01 23:48:57 thorpej Exp $	*/
+/*	$NetBSD: isadma_machdep.c,v 1.21 2003/05/05 12:55:42 fvdl Exp $	*/
 
 #define ISA_DMA_STATS
 
@@ -60,11 +60,6 @@
 
 extern paddr_t avail_end;		/* XXX temporary */
 
-/*
- * ISA can DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 /*
  * Cookie used by ISA DMA.  A pointer to one of these is stashed in
  * the DMA map.
diff --git a/sys/arch/evbmips/isa/isadma_bounce.c b/sys/arch/evbmips/isa/isadma_bounce.c
index e0a3e141b49b..51e3dff9ff65 100644
--- a/sys/arch/evbmips/isa/isadma_bounce.c
+++ b/sys/arch/evbmips/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_bounce.c,v 1.2 2002/03/18 01:21:12 simonb Exp $	*/
+/*	$NetBSD: isadma_bounce.c,v 1.3 2003/05/05 12:55:43 fvdl Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -57,11 +57,6 @@
 
 extern	paddr_t avail_end;
 
-/*
- * ISA can only DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 /*
  * Cookie used by bouncing ISA DMA.  A pointer to one of these is stashed
  * in the DMA map.
diff --git a/sys/arch/mvmeppc/isa/isadma_machdep.c b/sys/arch/mvmeppc/isa/isadma_machdep.c
index 7fdfa9a7c9f4..c170bdd738fd 100644
--- a/sys/arch/mvmeppc/isa/isadma_machdep.c
+++ b/sys/arch/mvmeppc/isa/isadma_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_machdep.c,v 1.2 2003/04/02 04:01:33 thorpej Exp $	*/
+/*	$NetBSD: isadma_machdep.c,v 1.3 2003/05/05 12:55:43 fvdl Exp $	*/
 
 #define ISA_DMA_STATS
 
@@ -59,11 +59,6 @@
 
 extern paddr_t avail_end;		/* XXX temporary */
 
-/*
- * ISA can DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 /*
  * Cookie used by ISA dma.  A pointer to one of these it stashed in
  * the DMA map.
diff --git a/sys/arch/prep/isa/isadma_machdep.c b/sys/arch/prep/isa/isadma_machdep.c
index 93b52ace0d4a..9870d41fb571 100644
--- a/sys/arch/prep/isa/isadma_machdep.c
+++ b/sys/arch/prep/isa/isadma_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_machdep.c,v 1.6 2003/04/02 04:27:17 thorpej Exp $	*/
+/*	$NetBSD: isadma_machdep.c,v 1.7 2003/05/05 12:55:43 fvdl Exp $	*/
 
 #define ISA_DMA_STATS
 
@@ -59,11 +59,6 @@
 
 extern paddr_t avail_end;		/* XXX temporary */
 
-/*
- * ISA can DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 /*
  * Cookie used by ISA dma.  A pointer to one of these it stashed in
  * the DMA map.
diff --git a/sys/arch/sandpoint/isa/isadma_machdep.c b/sys/arch/sandpoint/isa/isadma_machdep.c
index a16c51d5b403..2fc352cd41b1 100644
--- a/sys/arch/sandpoint/isa/isadma_machdep.c
+++ b/sys/arch/sandpoint/isa/isadma_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_machdep.c,v 1.4 2003/04/02 04:27:18 thorpej Exp $	*/
+/*	$NetBSD: isadma_machdep.c,v 1.5 2003/05/05 12:55:43 fvdl Exp $	*/
 
 #define ISA_DMA_STATS
 
@@ -60,11 +60,6 @@
 
 extern paddr_t avail_end;		/* XXX temporary */
 
-/*
- * ISA can DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 /*
  * Cookie used by ISA dma.  A pointer to one of these it stashed in
  * the DMA map.
diff --git a/sys/arch/x86/isa/isa_machdep.c b/sys/arch/x86/isa/isa_machdep.c
index f24d29d21022..4a797d061448 100644
--- a/sys/arch/x86/isa/isa_machdep.c
+++ b/sys/arch/x86/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.5 2003/05/03 18:11:08 wiz Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.6 2003/05/05 12:55:44 fvdl Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.5 2003/05/03 18:11:08 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.6 2003/05/05 12:55:44 fvdl Exp $");
 
 #define ISA_DMA_STATS
 
@@ -107,11 +107,6 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.5 2003/05/03 18:11:08 wiz Exp $");
 #include <machine/mpbiosvar.h>
 #endif
 
-/*
- * ISA can only DMA to 0-16M.
- */
-#define	ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
-
 extern	paddr_t avail_end;
 
 #define	IDTVEC(name)	__CONCAT(X,name)
diff --git a/sys/dev/isa/isareg.h b/sys/dev/isa/isareg.h
index 1ab23129b9d5..f211f9fd5679 100644
--- a/sys/dev/isa/isareg.h
+++ b/sys/dev/isa/isareg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: isareg.h,v 1.6 1998/03/22 15:44:02 drochner Exp $	*/
+/*	$NetBSD: isareg.h,v 1.7 2003/05/05 12:55:41 fvdl Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -160,4 +160,10 @@
 #define	IOM_BEGIN	0x0a0000		/* Start of I/O Memory "hole" */
 #define	IOM_END		0x100000		/* End of I/O Memory "hole" */
 #define	IOM_SIZE	(IOM_END - IOM_BEGIN)
+
+/*
+ * ISA DMA works < 16M (24 address lines).
+ */
+#define ISA_DMA_BOUNCE_THRESHOLD	(16 * 1024 * 1024)
+
 #endif /* !IOM_BEGIN */