diff options
| -rw-r--r-- | share/man/man4/Makefile | 4 | ||||
| -rw-r--r-- | share/man/man4/acd.4 | 45 | ||||
| -rw-r--r-- | share/man/man8/compat_linux.8 | 1 | ||||
| -rw-r--r-- | share/man/man8/man8.i386/MAKEDEV.8 | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/autoconf.c | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/conf.c | 9 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISK | 18 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/files.alpha | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 11 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 10 |
10 files changed, 23 insertions, 86 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b7557b32337..0ce5183ce90 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.67 1999/07/26 05:52:05 deraadt Exp $ +# $OpenBSD: Makefile,v 1.68 1999/07/30 19:06:36 deraadt Exp $ # $NetBSD: Makefile,v 1.22.4.2 1996/07/18 00:51:10 jtc Exp $ -MAN= atalk.4 atapiscsi.4 audio.4 acd.4 adv.4 ahc.4 bpf.4 bridge.4 ccd.4 \ +MAN= atalk.4 atapiscsi.4 audio.4 adv.4 ahc.4 bpf.4 bridge.4 ccd.4 \ cd.4 ch.4 clnp.4 cltp.4 ddb.4 de.4 drum.4 eap.4 ec.4 ep.4 esis.4 \ exphy.4 fd.4 ffs_softupdates.4 fpa.4 fxp.4 icmp.4 icsphy.4 idp.4 \ ifmedia.4 imp.4 inet.4 inphy.4 ip.4 ipl.4 ipsec.4 isapnp.4 iso.4 \ diff --git a/share/man/man4/acd.4 b/share/man/man4/acd.4 deleted file mode 100644 index a40bbad3869..00000000000 --- a/share/man/man4/acd.4 +++ /dev/null @@ -1,45 +0,0 @@ -.\" $OpenBSD: acd.4,v 1.5 1999/07/09 13:35:48 aaron Exp $ -.\" -.\" Copyright (c) 1996, Jason Downs. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS -.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, -.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd May 14, 1996 -.Dt ACD 4 -.Os -.Sh NAME -.Nm acd -.Nd ATAPI CD-ROM driver -.Sh SYNOPSIS -.Cd "atapibus* at wdc?" -.Cd "acd* at atapibus? drive?" -.Sh DESCRIPTION -The -.Nm acd -driver provides support for ATAPI CD-ROM drives, using standard IDE -controllers. -.Sh FILES -.Xr /dev/acd* -.Xr /dev/racd* -.Sh SEE ALSO -.Xr intro 4 , -.Xr wdc 4 diff --git a/share/man/man8/compat_linux.8 b/share/man/man8/compat_linux.8 index 20ed206ff0e..4f57bf24bb4 100644 --- a/share/man/man8/compat_linux.8 +++ b/share/man/man8/compat_linux.8 @@ -354,7 +354,6 @@ Only the DSP device is emulated, the following link should be created: CD-ROM support requires a link to your cdrom device, similar to: .Pp .nf -/emul/linux/dev/cdrom -> /dev/acd0a (first atapi cdrom) /emul/linux/dev/cdrom -> /dev/cd0a (first scsi cdrom) .fi .Pp diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8 index 69e61df9b07..d04207ce4b4 100644 --- a/share/man/man8/man8.i386/MAKEDEV.8 +++ b/share/man/man8/man8.i386/MAKEDEV.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: MAKEDEV.8,v 1.10 1999/07/09 13:35:36 aaron Exp $ +.\" $OpenBSD: MAKEDEV.8,v 1.11 1999/07/30 19:06:41 deraadt Exp $ .\" .\" Copyright (c) 1997, Jason Downs. All rights reserved. .\" @@ -111,8 +111,6 @@ pccons console or pcvt screen 0 pcvt console screens .It Ar tty# standard PC COM ports -.It Ar acd# -ATAPI CD-ROM drives .It Ar cd# SCSI CD-ROM drives .It Ar mcd# diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c index 499c82ccecb..ad094f3ed04 100644 --- a/sys/arch/alpha/alpha/autoconf.c +++ b/sys/arch/alpha/alpha/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.8 1998/07/01 02:29:39 angelos Exp $ */ +/* $OpenBSD: autoconf.c,v 1.9 1999/07/30 19:05:49 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $ */ /* @@ -141,7 +141,6 @@ struct nam2blk { { "cd", 3 }, { "rd", 6 }, { "sd", 8 }, - { "acd", 4 }, { "wd", 0 }, #if 0 { "fd", XXX }, diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 829358eac23..414a8b13638 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.19 1999/07/25 04:38:25 csapuntz Exp $ */ +/* $OpenBSD: conf.c,v 1.20 1999/07/30 19:05:49 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -49,8 +49,6 @@ bdev_decl(wd); bdev_decl(sw); #include "st.h" #include "cd.h" -#include "acd.h" -bdev_decl(acd); #include "sd.h" #include "ss.h" #include "uk.h" @@ -65,7 +63,7 @@ struct bdevsw bdevsw[] = bdev_swap_init(1,sw), /* 1: swap pseudo-device */ bdev_tape_init(NST,st), /* 2: SCSI tape */ bdev_disk_init(NCD,cd), /* 3: SCSI CD-ROM */ - bdev_disk_init(NACD,acd), /* 4: ATAPI CD-ROM */ + bdev_notdef(), /* 4 */ bdev_notdef(), /* 5 */ bdev_disk_init(NRD,rd), /* 6: ram disk driver */ bdev_disk_init(NCCD,ccd), /* 7: concatenated disk driver */ @@ -121,7 +119,6 @@ cdev_decl(rd); #endif cdev_decl(prom); /* XXX XXX XXX */ cdev_decl(wd); -cdev_decl(acd); #include "cy.h" cdev_decl(cy); #ifdef XFS @@ -170,7 +167,7 @@ struct cdevsw cdevsw[] = cdev_random_init(1,random), /* 34: random data source */ cdev_gen_ipf(NIPF,ipl), /* 35: IP filter log */ cdev_disk_init(NWD,wd), /* 36: ST506/ESDI/IDE disk */ - cdev_disk_init(NACD,acd), /* 37: ATAPI CD-ROM */ + cdev_notdef(), /* 37 */ cdev_tty_init(NCY,cy), /* 38: Cyclom serial port */ cdev_ksyms_init(NKSYMS,ksyms), /* 39: Kernel symbols device */ cdev_notdef(), /* 40 */ diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index 84eec983697..d5ca006ce2a 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.25 1999/06/22 01:28:50 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.26 1999/07/30 19:05:49 deraadt Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -154,19 +154,21 @@ ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards #wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System -wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE -wdc1 at isa? port 0x170 irq 15 # controllers #cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card # EISA devices #fea* at eisa? slot ? # DEC DEFEA FDDI cards -# devices/busses hanging of IDE controllers -atapibus* at wdc? # Virtual ATAPI bus -wd* at wdc? drive ? # ST506/ESDI/IDE disks +# IDE +#pciide* at pci ? dev ? function ? flags 0x0000 +#wdc0 at isa? port 0x1f0 irq 14 flags 0x00 +#wdc1 at isa? port 0x170 irq 15 flags 0x00 +#wd* at wdc? channel ? drive ? flags 0x0000 +#wd* at pciide? channel ? drive ? flags 0x0000 -# ATAPI devices -acd* at atapibus? drive? # ATAPI CD-ROM +#atapiscsi* at wdc? channel ? +#atapiscsi* at pciide? channel ? +#scsibus* at atapiscsi? # SCSI bus support #scsibus* at esp? diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index f491c942924..b5ef0ab16d9 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: files.alpha,v 1.25 1999/07/25 04:38:25 csapuntz Exp $ +# $OpenBSD: files.alpha,v 1.26 1999/07/30 19:05:50 deraadt Exp $ # $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $ # # alpha-specific configuration info @@ -118,8 +118,6 @@ file dev/tc/if_le_tc.c le_tc # # Machine-independent ATAPI drivers # -#include "dev/atapi/files.atapi" -#major { acd = 4 } include "dev/atapiscsi/files.atapiscsi" include "dev/ata/files.ata" diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index 0fea0692326..ffd768cb7ad 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.28 1997/10/28 10:52:18 niklas Exp $ */ +/* $OpenBSD: autoconf.c,v 1.29 1999/07/30 19:05:09 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -148,7 +148,7 @@ static const char *devname[] = { "", /* 15 */ "", /* 16 */ "rd", /* 17 = rd */ - "acd", /* 18 = acd */ + "", /* 18 */ "", /* 19 */ "" /* 20 */ }; @@ -232,10 +232,6 @@ extern struct cfdriver cd_cd; #if NMCD > 0 extern struct cfdriver mcd_cd; #endif -#include "acd.h" -#if NACD > 0 -extern struct cfdriver acd_cd; -#endif #include "fd.h" #if NFD > 0 extern struct cfdriver fd_cd; @@ -268,9 +264,6 @@ struct genericconf { #if NRD > 0 { &rd_cd, "rd", 17 }, #endif -#if NACD > 0 - { &acd_cd, "acd", 18 }, -#endif { 0 } }; diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 22ae2f62974..4061701d101 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.53 1999/07/18 22:40:53 csapuntz Exp $ */ +/* $OpenBSD: conf.c,v 1.54 1999/07/30 19:05:09 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -53,8 +53,6 @@ bdev_decl(wt); #include "st.h" #include "cd.h" #include "uk.h" -#include "acd.h" -bdev_decl(acd); #include "mcd.h" bdev_decl(mcd); #include "vnd.h" @@ -86,7 +84,7 @@ struct bdevsw bdevsw[] = bdev_disk_init(NSCD,scd), /* 15: Sony CD-ROM */ bdev_disk_init(NCCD,ccd), /* 16: concatenated disk driver */ bdev_disk_init(NRD,rd), /* 17: ram disk driver */ - bdev_disk_init(NACD,acd), /* 18: ATAPI CD-ROM */ + bdev_notdef, /* 18 */ bdev_disk_init(NRAID,raid), /* 19: RAIDframe disk driver */ }; int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); @@ -153,7 +151,6 @@ cdev_decl(scd); #include "vt.h" cdev_decl(pc); #include "ss.h" -cdev_decl(acd); #include "lpt.h" cdev_decl(lpt); #include "ch.h" @@ -242,7 +239,7 @@ struct cdevsw cdevsw[] = cdev_ocis_init(NAPM,apm), /* 21: Advancded Power Management */ cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ cdev_bpftun_init(NBPFILTER,bpf),/* 23: Berkeley packet filter */ - cdev_disk_init(NACD,acd), /* 24: ATAPI CD-ROM */ + cdev_notdef(), /* 24 */ #if 0 cdev_ocis_init(NPCMCIA,pcmcia), /* 25: PCMCIA Bus */ #else @@ -429,7 +426,6 @@ static struct { { "sd", 4 }, #if 0 /* XXX It's not clear at all that recognizing these will help us */ - { "acd", 18 }, { "cd", 6 }, { "mcd", 7 }, /* XXX I wonder if any BIOSes support this */ { "scd", 15 } /* - " - */ |