diff options
| -rw-r--r-- | etc/etc.alpha/MAKEDEV | 27 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/conf.c | 32 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 4 |
3 files changed, 27 insertions, 36 deletions
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV index 927b81d8192..fb7cfc8e613 100644 --- a/etc/etc.alpha/MAKEDEV +++ b/etc/etc.alpha/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.10 1996/09/18 22:03:37 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.11 1996/11/11 19:43:25 kstailey Exp $ # $NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -71,6 +71,7 @@ # mouse mouse (provides events, for X11) # *random inkernel random number generator # uk* unknown SCSI +# ss* SCSI scanners PATH=/sbin:/usr/sbin:/bin:/usr/bin umask 77 @@ -85,6 +86,7 @@ all) sh MAKEDEV bpf0 bpf1 bpf2 bpf3 tun0 tun1 tun2 tun3 sh MAKEDEV ttyB0 ttyB1 ttyC0 ttyC1 ttyE0 ttyE1 lkm sh MAKEDEV mmclock kbd mouse lpa0 lpt0 random + sh MAKEDEV uk0 uk1 ss0 ss1 sh MAKEDEV local ;; @@ -287,11 +289,11 @@ lpt*|lpa*) random|srandom|urandom|prandom|arandom) rm -f random urandom srandom prandom arandom - mknod random c 33 0 - mknod srandom c 33 1 - mknod urandom c 33 2 - mknod prandom c 33 3 - mknod arandom c 33 4 + mknod random c 34 0 + mknod srandom c 34 1 + mknod urandom c 34 2 + mknod prandom c 34 3 + mknod arandom c 34 4 chown root.wheel random srandom urandom prandom arandom chmod 644 random srandom urandom prandom arandom ;; @@ -299,11 +301,22 @@ random|srandom|urandom|prandom|arandom) uk*) unit=`expr $i : 'uk\(.*\)'` rm -f uk$unit - mknod uk$unit c 32 $unit + mknod uk$unit c 33 $unit chown root.operator uk$unit chmod 640 uk$unit ;; +ss*) + unit=`expr $i : 'ss\(.*\)'` + rm -f ss$unit + mknod ss$unit c 32 $unit + chown root.operator ss$unit + chmod 440 ss$unit +# backwards compatibility with older PINTs + rm -f scan$unit + ln -s ss$unit scan$unit + ;; + local) umask 0 sh MAKEDEV.local diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index f2a566cfda7..dffdbb0b1fa 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 1996/11/06 02:01:08 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.10 1996/11/11 19:43:27 kstailey Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -46,15 +46,12 @@ bdev_decl(sw); #include "st.h" -bdev_decl(st); #include "cd.h" -bdev_decl(cd); #include "sd.h" -bdev_decl(sd); +#include "ss.h" +#include "uk.h" #include "vnd.h" -bdev_decl(vnd); #include "ccd.h" -bdev_decl(ccd); #include "rd.h" bdev_decl(rd); @@ -91,33 +88,15 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]); dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ 0, seltrue, (dev_type_mmap((*))) enodev } -cdev_decl(cn); -cdev_decl(ctty); #define mmread mmrw #define mmwrite mmrw cdev_decl(mm); cdev_decl(sw); -cdev_decl(random); #include "pty.h" -#define ptstty ptytty -#define ptsioctl ptyioctl -cdev_decl(pts); -#define ptctty ptytty -#define ptcioctl ptyioctl -cdev_decl(ptc); -cdev_decl(log); #include "tun.h" -cdev_decl(tun); -cdev_decl(sd); -cdev_decl(vnd); -cdev_decl(ccd); dev_type_open(filedescopen); #include "bpfilter.h" -cdev_decl(bpf); -cdev_decl(st); -cdev_decl(cd); #include "ch.h" -cdev_decl(ch); #include "scc.h" cdev_decl(scc); #include "audio.h" @@ -131,10 +110,7 @@ cdev_decl(ms); #include "lpt.h" cdev_decl(lpt); cdev_decl(rd); -#include "ss.h" -cdev_decl(ss); -#include "uk.h" -cdev_decl(uk); + cdev_decl(prom); /* XXX XXX XXX */ diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 42d0eb2facb..da2d2e725e3 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.9 1996/10/30 22:38:38 niklas Exp $ +# $OpenBSD: GENERIC,v 1.10 1996/11/11 19:43:28 kstailey Exp $ # $NetBSD: GENERIC,v 1.24 1996/09/27 17:08:32 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -135,6 +135,8 @@ scsibus* at ncr? 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 ? # Workstation Console attachments wscons* at cfb? |