From de771425950a262da8d12fbd67847cf0d17b1463 Mon Sep 17 00:00:00 2001 From: bde Date: Thu, 11 Apr 1996 21:18:49 +0000 Subject: Moved AUTO_EOI_[12] and most sio and pcvt options out of the makefile. --- sys/amd64/isa/isa.c | 4 +++- sys/amd64/isa/vector.S | 4 +++- sys/amd64/isa/vector.s | 4 +++- sys/conf/options.i386 | 13 ++++++++++++- sys/dev/sio/sio.c | 6 ++++-- sys/i386/conf/options.i386 | 13 ++++++++++++- sys/i386/isa/isa.c | 4 +++- sys/i386/isa/pcvt/pcvt_hdr.h | 2 ++ sys/i386/isa/sio.c | 6 ++++-- sys/i386/isa/vector.s | 4 +++- sys/isa/sio.c | 6 ++++-- 11 files changed, 53 insertions(+), 13 deletions(-) (limited to 'sys') diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 32562b1..5be579c 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.66 1996/04/07 17:32:13 bde Exp $ + * $Id: isa.c,v 1.67 1996/04/08 19:38:55 smpatel Exp $ */ /* @@ -47,6 +47,8 @@ * isa_dmastart() */ +#include "opt_auto_eoi.h" + #include #include #include diff --git a/sys/amd64/isa/vector.S b/sys/amd64/isa/vector.S index 6410434..a5056af 100644 --- a/sys/amd64/isa/vector.S +++ b/sys/amd64/isa/vector.S @@ -1,8 +1,10 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.17 1996/01/19 23:38:07 phk Exp $ + * $Id: vector.s,v 1.18 1996/03/31 03:31:29 bde Exp $ */ +#include "opt_auto_eoi.h" + #include #include diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s index 6410434..a5056af 100644 --- a/sys/amd64/isa/vector.s +++ b/sys/amd64/isa/vector.s @@ -1,8 +1,10 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.17 1996/01/19 23:38:07 phk Exp $ + * $Id: vector.s,v 1.18 1996/03/31 03:31:29 bde Exp $ */ +#include "opt_auto_eoi.h" + #include #include diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 42ab489..41fa690 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id$ +# $Id: options.i386,v 1.8 1996/03/26 19:57:24 wollman Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -11,3 +11,14 @@ LARGEMEM opt_machdep.h MAXMEM opt_machdep.h LINUX opt_linux.h PERFMON opt_perfmon.h +AUTO_EOI_1 opt_auto_eoi.h +AUTO_EOI_2 opt_auto_eoi.h +BREAK_TO_DEBUGGER opt_comconsole.h +COMCONSOLE opt_comconsole.h +COM_ESP opt_sio.h +COM_MULTIPORT opt_sio.h +DSI_SOFT_MODEM opt_sio.h +FAT_CURSOR opt_pcvt.h +PCVT_FREEBSD=210 opt_pcvt.h +PCVT_SCANSET opt_pcvt.h +XSERVER opt_pcvt.h diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 3db645e..ab2fda0 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,11 +31,13 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.137 1996/04/10 04:18:36 scrappy Exp $ + * $Id: sio.c,v 1.138 1996/04/10 18:09:58 scrappy Exp $ */ -#include "sio.h" +#include "opt_comconsole.h" #include "opt_ddb.h" +#include "opt_sio.h" +#include "sio.h" /* * Serial driver, based on 386BSD-0.1 com driver. diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 42ab489..41fa690 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id$ +# $Id: options.i386,v 1.8 1996/03/26 19:57:24 wollman Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -11,3 +11,14 @@ LARGEMEM opt_machdep.h MAXMEM opt_machdep.h LINUX opt_linux.h PERFMON opt_perfmon.h +AUTO_EOI_1 opt_auto_eoi.h +AUTO_EOI_2 opt_auto_eoi.h +BREAK_TO_DEBUGGER opt_comconsole.h +COMCONSOLE opt_comconsole.h +COM_ESP opt_sio.h +COM_MULTIPORT opt_sio.h +DSI_SOFT_MODEM opt_sio.h +FAT_CURSOR opt_pcvt.h +PCVT_FREEBSD=210 opt_pcvt.h +PCVT_SCANSET opt_pcvt.h +XSERVER opt_pcvt.h diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 32562b1..5be579c 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.66 1996/04/07 17:32:13 bde Exp $ + * $Id: isa.c,v 1.67 1996/04/08 19:38:55 smpatel Exp $ */ /* @@ -47,6 +47,8 @@ * isa_dmastart() */ +#include "opt_auto_eoi.h" + #include #include #include diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index 65aa098..b1b65d3 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -68,6 +68,8 @@ #if PCVT_FREEBSD >= 200 +#include "opt_pcvt.h" + #include #include #include diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 3db645e..ab2fda0 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,11 +31,13 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.137 1996/04/10 04:18:36 scrappy Exp $ + * $Id: sio.c,v 1.138 1996/04/10 18:09:58 scrappy Exp $ */ -#include "sio.h" +#include "opt_comconsole.h" #include "opt_ddb.h" +#include "opt_sio.h" +#include "sio.h" /* * Serial driver, based on 386BSD-0.1 com driver. diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index 6410434..a5056af 100644 --- a/sys/i386/isa/vector.s +++ b/sys/i386/isa/vector.s @@ -1,8 +1,10 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.17 1996/01/19 23:38:07 phk Exp $ + * $Id: vector.s,v 1.18 1996/03/31 03:31:29 bde Exp $ */ +#include "opt_auto_eoi.h" + #include #include diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 3db645e..ab2fda0 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,11 +31,13 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.137 1996/04/10 04:18:36 scrappy Exp $ + * $Id: sio.c,v 1.138 1996/04/10 18:09:58 scrappy Exp $ */ -#include "sio.h" +#include "opt_comconsole.h" #include "opt_ddb.h" +#include "opt_sio.h" +#include "sio.h" /* * Serial driver, based on 386BSD-0.1 com driver. -- cgit v1.1