diff options
| author |   niklas <niklas@openbsd.org> | 1996-10-05 15:47:50 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1996-10-05 15:47:50 +0000 |
| commit | a5e1d7896c1af47d0b07b5e0bc4ab81000cdf7a6 (patch) | |
| tree | 935d71c0128e384afdfe2d9601ac89d38dc5c0e9 | |
| parent | strcasecmp hostnames; from netbsd (diff) | |
| download | wireguard-openbsd-a5e1d7896c1af47d0b07b5e0bc4ab81000cdf7a6.tar.xz wireguard-openbsd-a5e1d7896c1af47d0b07b5e0bc4ab81000cdf7a6.zip | |
use wd.h not wdc.h. Teach booting logic about wd and acd
| -rw-r--r-- | sys/arch/amiga/amiga/conf.c | 8 | ||||
| -rw-r--r-- | sys/arch/amiga/amiga/swapgeneric.c | 18 |
2 files changed, 20 insertions, 6 deletions
diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c index e48cdae8f03..0d8f9b6e82d 100644 --- a/sys/arch/amiga/amiga/conf.c +++ b/sys/arch/amiga/amiga/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.12 1996/08/29 09:25:51 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.13 1996/10/05 15:47:50 niklas Exp $ */ /* $NetBSD: conf.c,v 1.36 1996/05/19 21:04:18 veego Exp $ */ /*- @@ -60,7 +60,7 @@ int ttselect __P((dev_t, int, struct proc *)); #include "fd.h" #include "ccd.h" #include "ss.h" -#include "wdc.h" +#include "wd.h" #include "acd.h" #if 0 #include "rd.h" @@ -68,7 +68,7 @@ int ttselect __P((dev_t, int, struct proc *)); struct bdevsw bdevsw[] = { - bdev_disk_init(NWDC,wd), /* 0: ST506/ESDI/IDE disk */ + bdev_disk_init(NWD,wd), /* 0: ST506/ESDI/IDE disk */ bdev_notdef(), /* 1 */ bdev_disk_init(NFD,fd), /* 2: floppy disk */ bdev_swap_init(1,sw), /* 3: swap pseudo-device */ @@ -152,7 +152,7 @@ struct cdevsw cdevsw[] = cdev_gen_ipf(NIPF,ipl), /* 34: IP filter log */ cdev_random_init(NRANDOM,random), /* 35: random data source */ cdev_uk_init(NUK,uk), /* 36: unknown SCSI */ - cdev_disk_init(NWDC,wd), /* 37: ST506/ESDI/IDE disk */ + cdev_disk_init(NWD,wd), /* 37: ST506/ESDI/IDE disk */ cdev_disk_init(NACD,acd), /* 38: ATAPI CD-ROM */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c index cc1d169d95a..61f186bf72f 100644 --- a/sys/arch/amiga/amiga/swapgeneric.c +++ b/sys/arch/amiga/amiga/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.5 1996/05/29 10:14:35 niklas Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.6 1996/10/05 15:47:51 niklas Exp $ */ /* $NetBSD: swapgeneric.c,v 1.24 1996/05/21 17:15:40 is Exp $ */ /* @@ -51,9 +51,11 @@ #include "fd.h" #include "sd.h" +#include "wd.h" #include "cd.h" +#include "acd.h" -#if NCD > 0 +#if NCD + NACD > 0 #include <sys/mount.h> #include <isofs/cd9660/iso.h> #endif @@ -79,9 +81,15 @@ extern struct cfdriver fd_cd; #if NSD > 0 extern struct cfdriver sd_cd; #endif +#if NWD > 0 +extern struct cfdriver wd_cd; +#endif #if NCD > 0 extern struct cfdriver cd_cd; #endif +#if NACD > 0 +extern struct cfdriver acd_cd; +#endif struct genericconf { struct cfdriver *gc_driver; @@ -102,9 +110,15 @@ struct genericconf genericconf[] = { #if NSD > 0 {&sd_cd, makedev(4, 0)}, #endif +#if NWD > 0 + {&wd_cd, makedev(0, 0)}, +#endif #if NCD > 0 {&cd_cd, makedev(7, 0)}, #endif +#if NACD > 0 + {&acd_cd, makedev(15, 0)}, +#endif { 0 }, }; |