diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-07-30 19:06:42 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-07-30 19:06:42 +0000 |
| commit | 1f53c3415845fd3aed72c2a371ede66f80527c2b (patch) | |
| tree | cc42be85dd327ab99ea6a0fe506a99183997e65b /sys/arch/i386 | |
| parent | 4a1f4ffabb3991444f3f494254cc49ab2fc7cad9 (diff) | |
acd goes away
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 11 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 10 |
2 files changed, 5 insertions, 16 deletions
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 } /* - " - */ |