Convert BOUNCE_BUFFERS and BOUNCEPAGES to new option scheme.

17 files changed, 44 insertions, 14 deletions

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index bd3f4bc..a9c4961 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,13 +35,14 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.166 1995/12/30 23:13:32 davidg Exp $
+ *	$Id: machdep.c,v 1.168 1996/01/04 21:10:53 wollman Exp $
  */
 
 #include "npx.h"
 #include "isa.h"
 #include "opt_sysvipc.h"
 #include "opt_ddb.h"
+#include "opt_bounce.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index dcd7cba..4459bc8 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,10 +38,12 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.48 1995/12/11 04:55:01 dyson Exp $
+ *	$Id: vm_machdep.c,v 1.49 1995/12/14 08:31:01 phk Exp $
  */
 
 #include "npx.h"
+#include "opt_bounce.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/conf/options b/sys/conf/options
index e571cd8..63889ed 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,3 +1,4 @@
+BOUNCE_BUFFERS	opt_bounce.h
 DDB
 FDESC		opt_staticfs.h
 KERNFS		opt_staticfs.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 869a638..b319a3f 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,3 +1,4 @@
+BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		math_emulate.h
 GPL_MATH_EMULATE	math_emulate.h
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 869a638..b319a3f 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,3 +1,4 @@
+BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		math_emulate.h
 GPL_MATH_EMULATE	math_emulate.h
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index bd3f4bc..a9c4961 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,13 +35,14 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.166 1995/12/30 23:13:32 davidg Exp $
+ *	$Id: machdep.c,v 1.168 1996/01/04 21:10:53 wollman Exp $
  */
 
 #include "npx.h"
 #include "isa.h"
 #include "opt_sysvipc.h"
 #include "opt_ddb.h"
+#include "opt_bounce.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index dcd7cba..4459bc8 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,10 +38,12 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.48 1995/12/11 04:55:01 dyson Exp $
+ *	$Id: vm_machdep.c,v 1.49 1995/12/14 08:31:01 phk Exp $
  */
 
 #include "npx.h"
+#include "opt_bounce.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 6610a32..28feaee 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: vfs_bio.c,v 1.79 1995/12/14 08:32:09 phk Exp $
+ * $Id: vfs_bio.c,v 1.80 1996/01/04 06:09:00 davidg Exp $
  */
 
 /*
@@ -32,6 +32,8 @@
  * had been provided by David Greenman, also of the FreeBSD core team.
  */
 
+#include "opt_bounce.h"
+
 #define VMIO
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 0bc4cb9..0caead8 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,9 +14,11 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.54 1995/12/20 12:02:43 dufault Exp $
+ *      $Id: cd.c,v 1.55 1995/12/30 13:56:28 joerg Exp $
  */
 
+#include "opt_bounce.h"
+
 #define SPLCD splbio
 #define ESUCCESS 0
 #include <sys/types.h>
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 3a1e951..2afcc56 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.9 1995/12/10 20:19:32 bde Exp $
+ *	$Id: od.c,v 1.10 1995/12/14 09:54:22 phk Exp $
  */
 
 /*
@@ -36,6 +36,8 @@
  *   1. Add optical disk specific ioctl functions, such as eject etc.
  */
 
+#include "opt_bounce.h"
+
 #define SPLOD splbio
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c
index 7f459a1..453060d 100644
--- a/sys/scsi/pt.c
+++ b/sys/scsi/pt.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pt.c,v 1.11 1995/12/14 09:54:24 phk Exp $
+ *      $Id: pt.c,v 1.12 1995/12/14 19:51:13 bde Exp $
  */
 
 /*
@@ -46,6 +46,8 @@
  *     base behavior in scsi_driver.c
  */
 
+#include "opt_bounce.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 1287619..20bcc30 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -8,9 +8,11 @@
  * file.
  *
  * Written by Julian Elischer (julian@dialix.oz.au)
- *      $Id: scsi_base.c,v 1.33 1995/12/14 09:54:26 phk Exp $
+ *      $Id: scsi_base.c,v 1.34 1995/12/17 21:23:36 phk Exp $
  */
 
+#include "opt_bounce.h"
+
 #define SPLSD splbio
 #define ESUCCESS 0
 #include <sys/types.h>
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index a708de9..50aa65c 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -36,10 +36,13 @@
  * SUCH DAMAGE.
  *End copyright
  *
- * $Id: scsi_ioctl.c,v 1.17 1995/11/10 14:54:16 davidg Exp $
+ * $Id: scsi_ioctl.c,v 1.18 1995/12/14 09:54:27 phk Exp $
  *
  *
  */
+
+#include "opt_bounce.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index 1b60d4c..4797d98 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sctarg.c,v 1.11 1995/12/14 09:54:32 phk Exp $
+ *      $Id: sctarg.c,v 1.12 1995/12/14 19:51:15 bde Exp $
  */
 
 /*
@@ -46,6 +46,8 @@
  *     base behavior in scsi_driver.c
  */
 
+#include "opt_bounce.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 1368ff0..495ac8a 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -14,9 +14,11 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.81 1995/12/11 05:02:52 dyson Exp $
+ *      $Id: sd.c,v 1.82 1995/12/14 19:38:40 bde Exp $
  */
 
+#include "opt_bounce.h"
+
 #define SPLSD splbio
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 1410373..4bfe3e6 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.54 1995/12/10 19:52:59 bde Exp $
+ * $Id: st.c,v 1.55 1995/12/14 09:54:33 phk Exp $
  */
 
 /*
@@ -27,6 +27,8 @@
  *
  */
 
+#include "opt_bounce.h"
+
 #include <sys/types.h>
 
 #include <sys/param.h>
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index 4e80071..3486876 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.16 1995/12/14 09:54:35 phk Exp $
+ *      $Id: worm.c,v 1.17 1996/01/02 15:44:00 joerg Exp $
  */
 
 /* XXX This is PRELIMINARY.
@@ -51,6 +51,8 @@
  *     "scsi_driver" and use common code for all devices.
  */
 
+#include "opt_bounce.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>