From 2c2006d83f3d117481c84f56e7c1fa1fd3902e05 Mon Sep 17 00:00:00 2001 From: Andreas Schulz Date: Sun, 11 Sep 1994 21:09:52 +0000 Subject: [PATCH] Deleted the pccons driver from the files.i386, added the seagate driver into files.i386. LINT: Deleted the timezone line. Commented out the maxfdescs line and the SYSVSHM and the SHMMAXPGS lines. --- sys/conf/NOTES | 11 ++++------- sys/conf/files.i386 | 4 ++-- sys/i386/conf/LINT | 11 ++++------- sys/i386/conf/NOTES | 11 ++++------- sys/i386/conf/files.i386 | 4 ++-- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c29d0973317..35978775e3c 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -4,7 +4,7 @@ # # This kernel is NOT MEANT to be runnable! # -# $Id: LINT,v 1.76 1994/09/05 22:32:40 ats Exp $ +# $Id: LINT,v 1.77 1994/09/09 22:12:38 csgr Exp $ # machine "i386" @@ -12,9 +12,8 @@ cpu "I386_CPU" cpu "I486_CPU" cpu "I586_CPU" ident LINT -timezone 8 dst maxusers 10 -maxfdescs 2048 #Max file descriptors per process +# maxfdescs 2048 #Max file descriptors per process options MATH_EMULATE #Support for x87 emulation # Do not use in binary distributions @@ -109,8 +108,8 @@ device sd3 pseudo-device sl 2 device st0 device st1 -options SYSVSHM -options "SHMMAXPGS=64" # 256Kb of sharable memory +# options SYSVSHM +# options "SHMMAXPGS=64" # 256Kb of sharable memory options SYSVSEM options SYSVMSG #pseudo-device tb #tablet line discipline. @@ -167,8 +166,6 @@ device pas0 at isa? port 0x1f88 device pas1 at isa? port 0x1f84 device pas2 at isa? port 0x1f8c device pas3 at isa? port 0x1e88 -device pc0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#only one of pc0 or sc0 allowed #device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index b957728ed3d..bcd682695df 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.45 1994/09/05 22:32:42 ats Exp $ +# $Id: files.i386,v 1.46 1994/09/06 21:58:53 se Exp $ # i386/i386/autoconf.c standard device-driver i386/i386/conf.c standard @@ -64,11 +64,11 @@ i386/isa/mse.c optional mse device-driver i386/isa/npx.c optional npx device-driver i386/isa/pas.c optional pas device-driver i386/isa/syscons.c optional sc device-driver -i386/isa/pccons.c optional pc device-driver i386/isa/pcaudio.c optional pca device-driver i386/isa/psm.c optional psm device-driver i386/isa/sb.c optional sb device-driver i386/isa/scd.c optional scd device-driver +i386/isa/seagate.c optional sea device-driver i386/isa/sio.c optional sio device-driver i386/isa/sound/adlib_card.c optional snd device-driver i386/isa/sound/audio.c optional snd device-driver diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index c29d0973317..35978775e3c 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -4,7 +4,7 @@ # # This kernel is NOT MEANT to be runnable! # -# $Id: LINT,v 1.76 1994/09/05 22:32:40 ats Exp $ +# $Id: LINT,v 1.77 1994/09/09 22:12:38 csgr Exp $ # machine "i386" @@ -12,9 +12,8 @@ cpu "I386_CPU" cpu "I486_CPU" cpu "I586_CPU" ident LINT -timezone 8 dst maxusers 10 -maxfdescs 2048 #Max file descriptors per process +# maxfdescs 2048 #Max file descriptors per process options MATH_EMULATE #Support for x87 emulation # Do not use in binary distributions @@ -109,8 +108,8 @@ device sd3 pseudo-device sl 2 device st0 device st1 -options SYSVSHM -options "SHMMAXPGS=64" # 256Kb of sharable memory +# options SYSVSHM +# options "SHMMAXPGS=64" # 256Kb of sharable memory options SYSVSEM options SYSVMSG #pseudo-device tb #tablet line discipline. @@ -167,8 +166,6 @@ device pas0 at isa? port 0x1f88 device pas1 at isa? port 0x1f84 device pas2 at isa? port 0x1f8c device pas3 at isa? port 0x1e88 -device pc0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#only one of pc0 or sc0 allowed #device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index c29d0973317..35978775e3c 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -4,7 +4,7 @@ # # This kernel is NOT MEANT to be runnable! # -# $Id: LINT,v 1.76 1994/09/05 22:32:40 ats Exp $ +# $Id: LINT,v 1.77 1994/09/09 22:12:38 csgr Exp $ # machine "i386" @@ -12,9 +12,8 @@ cpu "I386_CPU" cpu "I486_CPU" cpu "I586_CPU" ident LINT -timezone 8 dst maxusers 10 -maxfdescs 2048 #Max file descriptors per process +# maxfdescs 2048 #Max file descriptors per process options MATH_EMULATE #Support for x87 emulation # Do not use in binary distributions @@ -109,8 +108,8 @@ device sd3 pseudo-device sl 2 device st0 device st1 -options SYSVSHM -options "SHMMAXPGS=64" # 256Kb of sharable memory +# options SYSVSHM +# options "SHMMAXPGS=64" # 256Kb of sharable memory options SYSVSEM options SYSVMSG #pseudo-device tb #tablet line discipline. @@ -167,8 +166,6 @@ device pas0 at isa? port 0x1f88 device pas1 at isa? port 0x1f84 device pas2 at isa? port 0x1f8c device pas3 at isa? port 0x1e88 -device pc0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#only one of pc0 or sc0 allowed #device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index b957728ed3d..bcd682695df 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.45 1994/09/05 22:32:42 ats Exp $ +# $Id: files.i386,v 1.46 1994/09/06 21:58:53 se Exp $ # i386/i386/autoconf.c standard device-driver i386/i386/conf.c standard @@ -64,11 +64,11 @@ i386/isa/mse.c optional mse device-driver i386/isa/npx.c optional npx device-driver i386/isa/pas.c optional pas device-driver i386/isa/syscons.c optional sc device-driver -i386/isa/pccons.c optional pc device-driver i386/isa/pcaudio.c optional pca device-driver i386/isa/psm.c optional psm device-driver i386/isa/sb.c optional sb device-driver i386/isa/scd.c optional scd device-driver +i386/isa/seagate.c optional sea device-driver i386/isa/sio.c optional sio device-driver i386/isa/sound/adlib_card.c optional snd device-driver i386/isa/sound/audio.c optional snd device-driver