diff options
Diffstat (limited to 'sys/arch/sun3')
| -rw-r--r-- | sys/arch/sun3/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/sun3/include/conf.h | 84 | ||||
| -rw-r--r-- | sys/arch/sun3/sun3/conf.c | 97 |
3 files changed, 97 insertions, 88 deletions
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC index e14fe023624..df10c60f77e 100644 --- a/sys/arch/sun3/conf/GENERIC +++ b/sys/arch/sun3/conf/GENERIC @@ -154,7 +154,9 @@ st* at scsibus? target ? lun ? cd0 at scsibus? target 6 lun 0 cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? +ch* at scsibus? target ? lun ? +ss* at scsibus? target ? lun ? +uk* at scsibus? target ? lun ? # RAM-disk drivers pseudo-device rd 2 diff --git a/sys/arch/sun3/include/conf.h b/sys/arch/sun3/include/conf.h new file mode 100644 index 00000000000..0f2abafae87 --- /dev/null +++ b/sys/arch/sun3/include/conf.h @@ -0,0 +1,84 @@ +/* $OpenBSD: conf.h,v 1.1 1996/11/11 23:51:40 kstailey Exp $ */ + +/*- + * Copyright (c) 1996 Kenneth Stailey. 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Kenneth Stailey. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + * + */ + +bdev_decl(rd); +/* no cdev for rd */ + +/* swap device (required) */ +bdev_decl(sw); +cdev_decl(sw); + +#include "xd.h" +bdev_decl(xd); +cdev_decl(xd); + +#define NXT 0 /* XXX */ +bdev_decl(xt); +cdev_decl(xt); + +#include "xy.h" +bdev_decl(xy); +cdev_decl(xy); + +/* + * Devices that have only CHR nodes are declared below. + */ + +cdev_decl(fd); + +dev_decl(filedesc,open); + +#define mmread mmrw +#define mmwrite mmrw +cdev_decl(mm); + +#define NZS 2 /* XXX: temporary hack */ +cdev_decl(zs); +cdev_decl(kd); +cdev_decl(ms); +cdev_decl(kbd); + +/* XXX - Should make keyboard/mouse real children of zs. */ +#if NZS > 1 +#define NKD 1 +#else +#define NKD 0 +#endif + +/* frame-buffer devices */ +cdev_decl(fb); +#include "bwtwo.h" +cdev_decl(bw2); +#include "cgtwo.h" +cdev_decl(cg2); +#include "cgfour.h" +cdev_decl(cg4); diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c index d0ed19c26d8..4ddc69c7a9a 100644 --- a/sys/arch/sun3/sun3/conf.c +++ b/sys/arch/sun3/sun3/conf.c @@ -44,47 +44,21 @@ #include <sys/conf.h> #include <sys/vnode.h> -int ttselect __P((dev_t, int, struct proc *)); +#include <machine/conf.h> -#include "cd.h" -bdev_decl(cd); -cdev_decl(cd); +int ttselect __P((dev_t, int, struct proc *)); +#include "bpfilter.h" #include "ccd.h" -bdev_decl(ccd); -cdev_decl(ccd); - +#include "cd.h" +#include "pty.h" #include "rd.h" -bdev_decl(rd); -/* no cdev for rd */ - #include "sd.h" -bdev_decl(sd); -cdev_decl(sd); - +#include "ss.h" #include "st.h" -bdev_decl(st); -cdev_decl(st); - -/* swap device (required) */ -bdev_decl(sw); -cdev_decl(sw); - +#include "tun.h" +#include "uk.h" #include "vnd.h" -bdev_decl(vnd); -cdev_decl(vnd); - -#include "xd.h" -bdev_decl(xd); -cdev_decl(xd); - -#define NXT 0 /* XXX */ -bdev_decl(xt); -cdev_decl(xt); - -#include "xy.h" -bdev_decl(xy); -cdev_decl(xy); struct bdevsw bdevsw[] = { @@ -115,59 +89,6 @@ struct bdevsw bdevsw[] = }; int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); -/* - * Devices that have only CHR nodes are declared below. - */ - -cdev_decl(cn); -cdev_decl(ctty); -#define mmread mmrw -#define mmwrite mmrw -cdev_decl(mm); - -#define NZS 2 /* XXX: temporary hack */ -cdev_decl(zs); -cdev_decl(kd); -cdev_decl(ms); -cdev_decl(kbd); - -/* XXX - Should make keyboard/mouse real children of zs. */ -#if NZS > 1 -#define NKD 1 -#else -#define NKD 0 -#endif - -#include "pty.h" -#define ptstty ptytty -#define ptsioctl ptyioctl -cdev_decl(pts); -#define ptctty ptytty -#define ptcioctl ptyioctl -cdev_decl(ptc); - -/* frame-buffer devices */ -cdev_decl(fb); -#include "bwtwo.h" -cdev_decl(bw2); -#include "cgtwo.h" -cdev_decl(cg2); -#include "cgfour.h" -cdev_decl(cg4); - -cdev_decl(log); -cdev_decl(fd); - -#include "bpfilter.h" -cdev_decl(bpf); - -#include "tun.h" -cdev_decl(tun); - -dev_decl(filedesc,open); -cdev_decl(random); - - struct cdevsw cdevsw[] = { cdev_cn_init(1,cn), /* 0: virtual console */ @@ -243,6 +164,8 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 70: open prom */ cdev_notdef(), /* 71: (sg?) */ cdev_init_random(1,random), /* 72: randomness source */ + cdev_uk_init(NUK,uk), /* 73: unknown SCSI */ + cdev_ss_init(NSS,ss), /* 74: SCSI scanner */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); |