From 9366f038af8fceb2bf9d199eec3302c4473db02d Mon Sep 17 00:00:00 2001 From: rgrimes Date: Tue, 25 Jan 1994 11:08:25 +0000 Subject: [PATCH] Disabled sg disk driver in LINT since there is no sg.c file in isa yet! Removed com port comments, since we are about to depricate the driver. Fix several plaes in LINT where people have been cutting and pasting using xterms :-( --- sys/conf/NOTES | 24 ++++++++++-------------- sys/i386/conf/GENERICAH | 9 +-------- sys/i386/conf/GENERICBT | 9 +-------- sys/i386/conf/LINT | 24 ++++++++++-------------- sys/i386/conf/NOTES | 24 ++++++++++-------------- sys/i386/conf/SYSCONS | 9 +-------- 6 files changed, 33 insertions(+), 66 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 6067ffa58f4a..525c23fa189b 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1,10 +1,10 @@ # # LINT -- config file for checking all the sources, tries to pull in -# as much of the source tree as it can. +# as much of the source tree as it can. # # This kernel is NOT MEANT to be runnable! # -# $Id: LINT,v 1.43 1994/01/22 09:25:37 rgrimes Exp $ +# $Id: LINT,v 1.44 1994/01/25 03:16:31 ache Exp $ # machine "i386" @@ -48,10 +48,10 @@ options IPBROADCASTECHO=1 #send reply to broadcast pings options IPMASKAGENT=1 #send reply to icmp mask requests options TPCONS #support X.25 network-layer service -options EXCLUDE_CHIP_MIDI # \ sound driver options -options "EXCLUDE_MPU401" # \ exclude specified -options EXCLUDE_GUS # / device or chip -options EXCLUDE_SBPRO # / from driver +options EXCLUDE_CHIP_MIDI # \ sound driver options +options "EXCLUDE_MPU401" # \ exclude specified +options EXCLUDE_GUS # / device or chip +options EXCLUDE_SBPRO # / from driver # # options that are in sys/conf/files @@ -91,8 +91,8 @@ device st1 pseudo-device swappager options SYSVSHM options "SHMMAXPGS=64" # 256Kb of sharable memory -options SYSVSEM -options SYSVMSG +options SYSVSEM +options SYSVMSG #pseudo-device tb #tablet line discipline. options TPIP # ISO TP class 4 over IP #pseudo-device tun @@ -110,13 +110,9 @@ controller aha0 at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr # driver for the Adaptec 174x SCSI cards. controller ahb0 at isa? bio irq 11 vector ahbintr # driver for the Bustek 742. -controller bt0 at isa? port "IO_BT0" bio irq 12 vector btintr +controller bt0 at isa? port "IO_BT0" bio irq 12 vector btintr # driver for the Seagate ST01/ST02 card, not yet finished. -controller sg0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector sgintr -device com0 at isa? port "IO_COM1" tty irq 4 vector comintr -device com1 at isa? port "IO_COM2" tty irq 3 vector comintr -device com2 at isa? port "IO_COM3" tty irq 5 vector comintr -device com3 at isa? port "IO_COM4" tty irq 9 vector comintr +#controller sg0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector sgintr #dcfclk device-driver controller fd0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr disk fd0 at fd0 drive 0 diff --git a/sys/i386/conf/GENERICAH b/sys/i386/conf/GENERICAH index 976531d5bbf0..68d7574d1078 100644 --- a/sys/i386/conf/GENERICAH +++ b/sys/i386/conf/GENERICAH @@ -1,7 +1,7 @@ # # GENERICAH -- Generic machine with WD/AHx family disks # -# $Id: GENERICAH,v 1.20 1994/01/04 20:10:30 nate Exp $ +# $Id: GENERICAH,v 1.21 1994/01/05 14:56:46 rgrimes Exp $ # machine "i386" @@ -60,13 +60,6 @@ device mcd0 at isa? port 0x300 bio irq 10 vector mcdintr device pc0 at isa? port "IO_KBD" tty irq 1 vector pcrint device npx0 at isa? port "IO_NPX" irq 13 vector npxintr -#The old drivers are rarely needed anymore... -#device com0 at isa? port "IO_COM1" tty irq 4 vector comintr -#device com1 at isa? port "IO_COM2" tty irq 3 vector comintr -#device com2 at isa? port "IO_COM3" tty irq 5 vector comintr -#device com3 at isa? port "IO_COM4" tty irq 9 vector comintr - -#For high speed serial lines. device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr device sio2 at isa? port "IO_COM3" tty irq 5 vector siointr diff --git a/sys/i386/conf/GENERICBT b/sys/i386/conf/GENERICBT index 351c96df3a8f..6c77cde1d1b6 100644 --- a/sys/i386/conf/GENERICBT +++ b/sys/i386/conf/GENERICBT @@ -1,7 +1,7 @@ # # GENERICBT -- Generic machine with WD/BTx family disks # -# $Id: GENERICBT,v 1.19 1994/01/04 20:10:32 nate Exp $ +# $Id: GENERICBT,v 1.20 1994/01/05 14:56:48 rgrimes Exp $ # machine "i386" @@ -59,13 +59,6 @@ device mcd0 at isa? port 0x300 bio irq 10 vector mcdintr device pc0 at isa? port "IO_KBD" tty irq 1 vector pcrint device npx0 at isa? port "IO_NPX" irq 13 vector npxintr -#The old drivers are rarely needed anymore... -#device com0 at isa? port "IO_COM1" tty irq 4 vector comintr -#device com1 at isa? port "IO_COM2" tty irq 3 vector comintr -#device com2 at isa? port "IO_COM3" tty irq 5 vector comintr -#device com3 at isa? port "IO_COM4" tty irq 9 vector comintr - -#For high speed serial lines. device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr device sio2 at isa? port "IO_COM3" tty irq 5 vector siointr diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 6067ffa58f4a..525c23fa189b 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -1,10 +1,10 @@ # # LINT -- config file for checking all the sources, tries to pull in -# as much of the source tree as it can. +# as much of the source tree as it can. # # This kernel is NOT MEANT to be runnable! # -# $Id: LINT,v 1.43 1994/01/22 09:25:37 rgrimes Exp $ +# $Id: LINT,v 1.44 1994/01/25 03:16:31 ache Exp $ # machine "i386" @@ -48,10 +48,10 @@ options IPBROADCASTECHO=1 #send reply to broadcast pings options IPMASKAGENT=1 #send reply to icmp mask requests options TPCONS #support X.25 network-layer service -options EXCLUDE_CHIP_MIDI # \ sound driver options -options "EXCLUDE_MPU401" # \ exclude specified -options EXCLUDE_GUS # / device or chip -options EXCLUDE_SBPRO # / from driver +options EXCLUDE_CHIP_MIDI # \ sound driver options +options "EXCLUDE_MPU401" # \ exclude specified +options EXCLUDE_GUS # / device or chip +options EXCLUDE_SBPRO # / from driver # # options that are in sys/conf/files @@ -91,8 +91,8 @@ device st1 pseudo-device swappager options SYSVSHM options "SHMMAXPGS=64" # 256Kb of sharable memory -options SYSVSEM -options SYSVMSG +options SYSVSEM +options SYSVMSG #pseudo-device tb #tablet line discipline. options TPIP # ISO TP class 4 over IP #pseudo-device tun @@ -110,13 +110,9 @@ controller aha0 at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr # driver for the Adaptec 174x SCSI cards. controller ahb0 at isa? bio irq 11 vector ahbintr # driver for the Bustek 742. -controller bt0 at isa? port "IO_BT0" bio irq 12 vector btintr +controller bt0 at isa? port "IO_BT0" bio irq 12 vector btintr # driver for the Seagate ST01/ST02 card, not yet finished. -controller sg0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector sgintr -device com0 at isa? port "IO_COM1" tty irq 4 vector comintr -device com1 at isa? port "IO_COM2" tty irq 3 vector comintr -device com2 at isa? port "IO_COM3" tty irq 5 vector comintr -device com3 at isa? port "IO_COM4" tty irq 9 vector comintr +#controller sg0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector sgintr #dcfclk device-driver controller fd0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr disk fd0 at fd0 drive 0 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 6067ffa58f4a..525c23fa189b 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1,10 +1,10 @@ # # LINT -- config file for checking all the sources, tries to pull in -# as much of the source tree as it can. +# as much of the source tree as it can. # # This kernel is NOT MEANT to be runnable! # -# $Id: LINT,v 1.43 1994/01/22 09:25:37 rgrimes Exp $ +# $Id: LINT,v 1.44 1994/01/25 03:16:31 ache Exp $ # machine "i386" @@ -48,10 +48,10 @@ options IPBROADCASTECHO=1 #send reply to broadcast pings options IPMASKAGENT=1 #send reply to icmp mask requests options TPCONS #support X.25 network-layer service -options EXCLUDE_CHIP_MIDI # \ sound driver options -options "EXCLUDE_MPU401" # \ exclude specified -options EXCLUDE_GUS # / device or chip -options EXCLUDE_SBPRO # / from driver +options EXCLUDE_CHIP_MIDI # \ sound driver options +options "EXCLUDE_MPU401" # \ exclude specified +options EXCLUDE_GUS # / device or chip +options EXCLUDE_SBPRO # / from driver # # options that are in sys/conf/files @@ -91,8 +91,8 @@ device st1 pseudo-device swappager options SYSVSHM options "SHMMAXPGS=64" # 256Kb of sharable memory -options SYSVSEM -options SYSVMSG +options SYSVSEM +options SYSVMSG #pseudo-device tb #tablet line discipline. options TPIP # ISO TP class 4 over IP #pseudo-device tun @@ -110,13 +110,9 @@ controller aha0 at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr # driver for the Adaptec 174x SCSI cards. controller ahb0 at isa? bio irq 11 vector ahbintr # driver for the Bustek 742. -controller bt0 at isa? port "IO_BT0" bio irq 12 vector btintr +controller bt0 at isa? port "IO_BT0" bio irq 12 vector btintr # driver for the Seagate ST01/ST02 card, not yet finished. -controller sg0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector sgintr -device com0 at isa? port "IO_COM1" tty irq 4 vector comintr -device com1 at isa? port "IO_COM2" tty irq 3 vector comintr -device com2 at isa? port "IO_COM3" tty irq 5 vector comintr -device com3 at isa? port "IO_COM4" tty irq 9 vector comintr +#controller sg0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector sgintr #dcfclk device-driver controller fd0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr disk fd0 at fd0 drive 0 diff --git a/sys/i386/conf/SYSCONS b/sys/i386/conf/SYSCONS index 62764d2eb2dc..03c6da45b591 100644 --- a/sys/i386/conf/SYSCONS +++ b/sys/i386/conf/SYSCONS @@ -1,7 +1,7 @@ # # SYSCONS -- Generic machine with WD/AHx family disks and syscons # -# $Id: SYSCONS,v 1.14 1994/01/04 20:10:34 nate Exp $ +# $Id: SYSCONS,v 1.15 1994/01/05 14:56:50 rgrimes Exp $ # machine "i386" @@ -58,13 +58,6 @@ device cd0 #Only need one of these, the code dynamically grows device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr device npx0 at isa? port "IO_NPX" irq 13 vector npxintr -#The old drivers are rarely needed anymore... -#device com0 at isa? port "IO_COM1" tty irq 4 vector comintr -#device com1 at isa? port "IO_COM2" tty irq 3 vector comintr -#device com2 at isa? port "IO_COM3" tty irq 5 vector comintr -#device com3 at isa? port "IO_COM4" tty irq 9 vector comintr - -#For high speed serial lines. device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr device sio2 at isa? port "IO_COM3" tty irq 5 vector siointr