diff options
| author | kstailey <kstailey@cvs.openbsd.org> | 1996-11-11 23:20:48 +0000 |
|---|---|---|
| committer | kstailey <kstailey@cvs.openbsd.org> | 1996-11-11 23:20:48 +0000 |
| commit | a2709c396de005feb83970a5e50a9fe6b63dc77f (patch) | |
| tree | b076e0b292efb7f8c71b0d45cf03a84467eb2666 /sys/arch | |
| parent | d1cc9c5720aa64b90afed2cd93937f5c37bbb1a8 (diff) | |
Updates for SCSI scanner and SCSI unknown devices.
Removed MI *dev_decl() stuff that is now in sys/conf.h
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/pmax/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/pmax/pmax/conf.c | 38 |
2 files changed, 6 insertions, 35 deletions
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC index 8511153aedf..134c1a7ca6c 100644 --- a/sys/arch/pmax/conf/GENERIC +++ b/sys/arch/pmax/conf/GENERIC @@ -152,7 +152,8 @@ scsibus* at asc? sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? - +ss* at scsibus? target ? lun ? +uk* at scsibus? target ? lun ? # # SCSI configuration for old DECstation SCSI driver diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c index 21c9d604ee6..2cff17a2b40 100644 --- a/sys/arch/pmax/pmax/conf.c +++ b/sys/arch/pmax/pmax/conf.c @@ -46,27 +46,19 @@ #include <sys/conf.h> #include <sys/vnode.h> -#ifndef LKM -#define lkmenodev enodev -#else -int lkmenodev __P((void)); -#endif - int ttselect __P((dev_t, int, struct proc *)); #include "vnd.h" -bdev_decl(vnd); bdev_decl(sw); #include "rz.h" bdev_decl(rz); #include "tz.h" bdev_decl(tz); #include "sd.h" -bdev_decl(sd); #include "st.h" -bdev_decl(st); +#include "ss.h" +#include "uk.h" #include "ccd.h" -bdev_decl(ccd); struct bdevsw bdevsw[] = { @@ -117,29 +109,14 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); dev_t swapdev = makedev(4, 0); -cdev_decl(cn); cdev_decl(sw); -cdev_decl(random); -cdev_decl(ctty); #define mmread mmrw #define mmwrite mmrw dev_type_read(mmrw); cdev_decl(mm); #include "pty.h" -#define ptstty ptytty -#define ptsioctl ptyioctl -cdev_decl(pts); -#define ptctty ptytty -#define ptcioctl ptyioctl -cdev_decl(ptc); -cdev_decl(log); cdev_decl(fd); -cdev_decl(sd); -cdev_decl(st); -cdev_decl(vnd); -cdev_decl(ccd); #include "bpfilter.h" -cdev_decl(bpf); #include "dtop.h" cdev_decl(dtop); #include "dc.h" @@ -162,14 +139,6 @@ cdev_decl(xcfb); cdev_decl(mfb); dev_decl(filedesc,open); -#ifdef LKM -#define NLKM 1 -#else -#define NLKM 0 -#endif -cdev_decl(lkm); - - /* a framebuffer with an attached mouse: */ /* open, close, ioctl, select, mmap */ @@ -283,7 +252,8 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 95 */ cdev_lkm_dummy(), /* 96 */ cdev_random_init(1,random), /* 97 */ - + cdev_uk_init(NUK,uk), /* 98: unknown SCSI */ + cdev_ss_init(NSS,ss), /* 99: SCSI scanner */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); |