diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/alpha/alpha/conf.c | 5 | ||||
-rw-r--r-- | sys/arch/amiga/amiga/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/amiga/include/conf.h | 5 | ||||
-rw-r--r-- | sys/arch/hp300/hp300/conf.c | 25 | ||||
-rw-r--r-- | sys/arch/i386/i386/conf.c | 10 | ||||
-rw-r--r-- | sys/arch/mac68k/mac68k/conf.c | 10 | ||||
-rw-r--r-- | sys/arch/macppc/macppc/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/mvme68k/mvme68k/conf.c | 9 | ||||
-rw-r--r-- | sys/arch/mvmeppc/mvmeppc/conf.c | 32 | ||||
-rw-r--r-- | sys/arch/sparc/include/conf.h | 8 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/sparc64/include/conf.h | 11 | ||||
-rw-r--r-- | sys/arch/sparc64/sparc64/conf.c | 5 | ||||
-rw-r--r-- | sys/arch/sun3/include/conf.h | 8 | ||||
-rw-r--r-- | sys/arch/sun3/sun3/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/vax/vax/conf.c | 43 |
16 files changed, 23 insertions, 164 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 395ca9bff15..e6cda9791b5 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.34 2001/10/26 01:28:06 nate Exp $ */ +/* $OpenBSD: conf.c,v 1.35 2001/12/11 23:18:59 miod Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -91,7 +91,6 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]); cdev_decl(mm); #include "pty.h" #include "tun.h" -dev_type_open(filedescopen); #include "bpfilter.h" #include "iop.h" #include "ch.h" @@ -293,7 +292,7 @@ static int chrtoblktbl[] = { /* 40 */ NODEV, /* 41 */ NODEV, /* 42 */ NODEV, - /* 43 */ 16, + /* 43 */ 16, /* raid */ /* 44 */ NODEV, /* 45 */ NODEV, /* 46 */ NODEV, diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c index a7c86838283..aa3a0f99c4d 100644 --- a/sys/arch/amiga/amiga/conf.c +++ b/sys/arch/amiga/amiga/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.32 2001/09/28 02:53:13 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.33 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $ */ /*- @@ -100,14 +100,12 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); #include "ms.h" #include "view.h" #include "mfcs.h" -dev_decl(filedesc,open); #include "bpfilter.h" #include "tun.h" #include "com.h" #include "lpt.h" #include "uk.h" #include "audio.h" -cdev_decl(audio); /* open, close, read */ #define cdev_joy_init(c,n) { \ diff --git a/sys/arch/amiga/include/conf.h b/sys/arch/amiga/include/conf.h index e4f8d3cba8c..d19241ebd18 100644 --- a/sys/arch/amiga/include/conf.h +++ b/sys/arch/amiga/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.13 2001/06/27 06:18:29 angelos Exp $ */ +/* $OpenBSD: conf.h,v 1.14 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.h,v 1.4 1996/11/30 01:13:07 is Exp $ */ /* @@ -57,9 +57,6 @@ cdev_decl(par); cdev_decl(ser); -bdev_decl(sw); -cdev_decl(sw); - cdev_decl(view); bdev_decl(wd); diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c index 8b9fa945660..01dff99f623 100644 --- a/sys/arch/hp300/hp300/conf.c +++ b/sys/arch/hp300/hp300/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.27 2001/09/28 02:53:13 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.28 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */ /*- @@ -51,15 +51,10 @@ bdev_decl(mt); #include "hd.h" bdev_decl(hd); #include "sd.h" -bdev_decl(sd); #include "ccd.h" -bdev_decl(ccd); #include "vnd.h" -bdev_decl(vnd); #include "st.h" -bdev_decl(st); #include "rd.h" -bdev_decl(rd); struct bdevsw bdevsw[] = { @@ -101,21 +96,11 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); (dev_type_stop((*))) enodev, 0, dev_init(c,n,select), \ dev_init(c,n,mmap) } -cdev_decl(cn); -cdev_decl(ctty); #define mmread mmrw #define mmwrite 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(ct); -cdev_decl(sd); cdev_decl(hd); #include "grf.h" cdev_decl(grf); @@ -132,17 +117,9 @@ cdev_decl(hil); #include "dcm.h" cdev_decl(dcm); cdev_decl(mt); -cdev_decl(ccd); -cdev_decl(vnd); -cdev_decl(st); cdev_decl(fd); -dev_decl(filedesc,open); #include "bpfilter.h" -cdev_decl(bpf); #include "tun.h" -cdev_decl(tun); -cdev_decl(random); -cdev_decl(rd); #include "ksyms.h" cdev_decl(ksyms); #ifdef XFS diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 839b4593d7f..b02818346c2 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.83 2001/12/05 23:58:41 tdeval Exp $ */ +/* $OpenBSD: conf.c,v 1.84 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -63,8 +63,6 @@ bdev_decl(scd); #include "ccd.h" #include "raid.h" #include "rd.h" -bdev_decl(rd); -cdev_decl(rd); struct bdevsw bdevsw[] = { @@ -162,7 +160,6 @@ cdev_decl(pc); #include "lpt.h" cdev_decl(lpt); #include "ch.h" -dev_decl(filedesc,open); #include "bpfilter.h" #if 0 #include "pcmcia.h" @@ -183,12 +180,9 @@ cdev_decl(cy); cdev_decl(mcd); #include "tun.h" #include "audio.h" -cdev_decl(audio); #include "midi.h" -cdev_decl(midi); #include "sequencer.h" cdev_decl(music); -cdev_decl(svr4_net); #include "joy.h" #include "apm.h" #include "pctr.h" @@ -221,7 +215,6 @@ cdev_decl(uscanner); #include "cz.h" cdev_decl(cztty); #include "radio.h" -cdev_decl(radio); /* XXX -- this needs to be supported by config(8)! */ #if (NCOM > 0) && (NPCCOM > 0) @@ -232,7 +225,6 @@ cdev_decl(radio); #include "wskbd.h" #include "wsmouse.h" #include "wsmux.h" -cdev_decl(wsmux); #ifdef USER_PCICONF #include "pci.h" diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c index 7a0cde15813..25c71cb0b88 100644 --- a/sys/arch/mac68k/mac68k/conf.c +++ b/sys/arch/mac68k/mac68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.26 2001/09/28 02:53:13 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.27 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */ /* @@ -47,8 +47,6 @@ #include <sys/vnode.h> #include <dev/cons.h> -int ttselect __P((dev_t, int, struct proc *)); - #include "st.h" #include "sd.h" #include "cd.h" @@ -56,8 +54,6 @@ int ttselect __P((dev_t, int, struct proc *)); #include "vnd.h" #include "ccd.h" #include "rd.h" -bdev_decl(rd); -/* No cdev for rd */ struct bdevsw bdevsw[] = { @@ -91,9 +87,7 @@ cdev_decl(ite); cdev_decl(mm); #include "pty.h" #include "ss.h" -cdev_decl(ss); #include "uk.h" -cdev_decl(uk); cdev_decl(fd); #include "grf.h" cdev_decl(grf); @@ -104,10 +98,8 @@ cdev_decl(zsc); #include "zstty.h" cdev_decl(zs); #include "ch.h" -cdev_decl(ch); #include "bpfilter.h" #include "tun.h" -dev_decl(filedesc,open); #include "asc.h" cdev_decl(asc); #include "ksyms.h" diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c index 2de543c0c01..772d0a8b8f8 100644 --- a/sys/arch/macppc/macppc/conf.c +++ b/sys/arch/macppc/macppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.7 2001/12/05 23:58:41 tdeval Exp $ */ +/* $OpenBSD: conf.c,v 1.8 2001/12/11 23:19:02 miod Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -116,8 +116,6 @@ cdev_decl(xfs_dev); #define NLKM 0 #endif -cdev_decl(lkm); - #include "ksyms.h" cdev_decl(ksyms); #include "usb.h" diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c index ff26ac3690e..4e3ba7ce802 100644 --- a/sys/arch/mvme68k/mvme68k/conf.c +++ b/sys/arch/mvme68k/mvme68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.24 2001/09/28 02:53:13 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.25 2001/12/11 23:19:02 miod Exp $ */ /*- * Copyright (c) 1995 Theo de Raadt @@ -72,8 +72,6 @@ #include <sys/conf.h> #include <sys/vnode.h> -int ttselect __P((dev_t, int, struct proc *)); - #include "st.h" #include "sd.h" #include "cd.h" @@ -85,7 +83,6 @@ bdev_decl(xd); #include "vnd.h" #include "ccd.h" #include "rd.h" -bdev_decl(rd); struct bdevsw bdevsw[] = { @@ -168,12 +165,8 @@ cdev_decl(xfs_dev); cdev_decl(ksyms); cdev_decl(xd); -cdev_decl(rd); - -dev_decl(filedesc,open); #include "bpfilter.h" - #include "tun.h" #include "pf.h" diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c index fa341f13c24..89070db43c3 100644 --- a/sys/arch/mvmeppc/mvmeppc/conf.c +++ b/sys/arch/mvmeppc/mvmeppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 2001/12/05 23:58:41 tdeval Exp $ */ +/* $OpenBSD: conf.c,v 1.10 2001/12/11 23:19:02 miod Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -43,19 +43,13 @@ #include "wd.h" bdev_decl(wd); #include "sd.h" -bdev_decl(sd); #include "cd.h" -bdev_decl(cd); #include "rd.h" -bdev_decl(rd); #include "vnd.h" -bdev_decl(vnd); #include "ccd.h" -bdev_decl(ccd); #include "raid.h" -bdev_decl(raid); struct bdevsw bdevsw[] = { bdev_disk_init(NWD,wd), /* 0: ST506/ESDI/IDE disk */ @@ -85,19 +79,10 @@ struct bdevsw bdevsw[] = { }; int nblkdev = sizeof bdevsw / sizeof bdevsw[0]; -cdev_decl(cn); -cdev_decl(ctty); #define mmread mmrw #define mmwrite 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); #include "bugtty.h" cdev_decl(bugtty); @@ -110,26 +95,13 @@ cdev_decl(ms); #include <cd.h> #include <uk.h> #include <ss.h> -cdev_decl(st); -cdev_decl(sd); -cdev_decl(cd); -cdev_decl(vnd); -cdev_decl(ccd); -cdev_decl(rd); -#include "raid.h" -cdev_decl(raid); #include <wd.h> cdev_decl(wd); -dev_decl(filedesc,open); - #include "bpfilter.h" -cdev_decl(bpf); #include "tun.h" -cdev_decl(tun); -cdev_decl(random); #ifdef XFS #include <xfs/nxfs.h> @@ -142,8 +114,6 @@ cdev_decl(xfs_dev); #define NLKM 0 #endif -cdev_decl(lkm); - #include "ksyms.h" cdev_decl(ksyms); diff --git a/sys/arch/sparc/include/conf.h b/sys/arch/sparc/include/conf.h index c4ce8aaa295..322831f53f8 100644 --- a/sys/arch/sparc/include/conf.h +++ b/sys/arch/sparc/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.12 2001/08/17 13:52:29 mickey Exp $ */ +/* $OpenBSD: conf.h,v 1.13 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.h,v 1.8 1996/12/31 07:12:43 mrg Exp $ */ /* @@ -84,12 +84,6 @@ cdev_decl(xd); bdev_decl(xy); cdev_decl(xy); -bdev_decl(sw); -cdev_decl(sw); - -bdev_decl(rd); -cdev_decl(rd); - /* open, close, write, ioctl */ #define cdev_bpp_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c index 1157cb7d2cd..49d4cac45d0 100644 --- a/sys/arch/sparc/sparc/conf.c +++ b/sys/arch/sparc/sparc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.30 2001/12/05 23:58:41 tdeval Exp $ */ +/* $OpenBSD: conf.c,v 1.31 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */ /* @@ -103,7 +103,7 @@ struct bdevsw bdevsw[] = bdev_notdef(), /* 1 */ bdev_notdef(), /* 2 */ bdev_disk_init(NXY,xy), /* 3: SMD disk */ - bdev_swap_init(1,sw), /* 4 */ + bdev_swap_init(1,sw), /* 4 swap pseudo-device */ bdev_notdef(), /* 5 */ bdev_notdef(), /* 6 */ bdev_disk_init(NSD,sd), /* 7: SCSI disk */ diff --git a/sys/arch/sparc64/include/conf.h b/sys/arch/sparc64/include/conf.h index 0fdae498dbd..9981c390c7c 100644 --- a/sys/arch/sparc64/include/conf.h +++ b/sys/arch/sparc64/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.5 2001/11/15 03:59:08 jason Exp $ */ +/* $OpenBSD: conf.h,v 1.6 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.h,v 1.9 2001/03/26 12:33:26 lukem Exp $ */ /*- @@ -84,15 +84,6 @@ cdev_decl(tcx); cdev_decl(cgfourteen); -bdev_decl(sw); -cdev_decl(sw); - -bdev_decl(raid); -cdev_decl(raid); - -bdev_decl(md); -cdev_decl(md); - cdev_decl(bpp); cdev_decl(lpt); diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c index 8f3da467c19..37b97168a4d 100644 --- a/sys/arch/sparc64/sparc64/conf.c +++ b/sys/arch/sparc64/sparc64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.15 2001/12/05 23:58:41 tdeval Exp $ */ +/* $OpenBSD: conf.c,v 1.16 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */ /* @@ -104,7 +104,6 @@ #include "rd.h" #include "ses.h" -cdev_decl(ses); #include "pf.h" @@ -124,7 +123,7 @@ struct bdevsw bdevsw[] = bdev_notdef(), /* 1 */ bdev_notdef(), /* 2 */ bdev_notdef(), /* 3: SMD disk -- not this arch */ - bdev_swap_init(1,sw), /* 4 */ + bdev_swap_init(1,sw), /* 4 swap pseudo-device */ bdev_disk_init(NRD,rd), /* 5: ram disk */ bdev_notdef(), /* 6 */ bdev_disk_init(NSD,sd), /* 7: SCSI disk */ diff --git a/sys/arch/sun3/include/conf.h b/sys/arch/sun3/include/conf.h index 29f48f56084..2b02e46d4a1 100644 --- a/sys/arch/sun3/include/conf.h +++ b/sys/arch/sun3/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.9 2001/06/27 06:24:05 angelos Exp $ */ +/* $OpenBSD: conf.h,v 1.10 2001/12/11 23:19:02 miod Exp $ */ /*- * Copyright (c) 1996 Kenneth Stailey. All rights reserved. @@ -33,10 +33,6 @@ bdev_decl(rd); cdev_decl(rd); -/* swap device (required) */ -bdev_decl(sw); -cdev_decl(sw); - bdev_decl(xd); cdev_decl(xd); @@ -53,8 +49,6 @@ cdev_decl(xy); cdev_decl(fd); -dev_decl(filedesc,open); - cdev_decl(idprom); #define mmread mmrw diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c index 4320d208f65..2a9917fab18 100644 --- a/sys/arch/sun3/sun3/conf.c +++ b/sys/arch/sun3/sun3/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.30 2001/09/28 02:53:14 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.31 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.c,v 1.51 1996/11/04 16:16:09 gwr Exp $ */ /*- @@ -47,8 +47,6 @@ #include <machine/conf.h> -int ttselect __P((dev_t, int, struct proc *)); - #include "bpfilter.h" #include "bwtwo.h" #include "ccd.h" diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index bc2358b3eb1..a71141d8ba1 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.30 2001/09/28 02:53:14 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.31 2001/12/11 23:19:02 miod Exp $ */ /* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */ /*- @@ -97,26 +97,18 @@ bdev_decl(rl); #endif #include "ccd.h" -bdev_decl(ccd); #include "raid.h" -bdev_decl(raid); #include "vnd.h" -bdev_decl(vnd); #include "hdc.h" bdev_decl(hd); bdev_decl(ry); #include "sd.h" -bdev_decl(sd); - #include "st.h" -bdev_decl(st); - #include "cd.h" -bdev_decl(cd); #include "ksyms.h" cdev_decl(ksyms); @@ -197,6 +189,8 @@ int bdevtomaj (bdev) #include <dev/cons.h> #include "wskbd.h" +#include "smg.h" +#if NSMG > 0 #if NWSKBD > 0 #define smgcngetc wskbd_cngetc #else @@ -205,7 +199,8 @@ smgcngetc(dev_t dev) { return 0; } -#endif +#endif /* NWSKBD > 0 */ +#endif /* NSMG > 0 */ #define smgcnputc wsdisplay_cnputc #define smgcnpollc nullcnpollc @@ -216,7 +211,6 @@ cons_decl(qd); cons_decl(smg); #include "qv.h" #include "qd.h" -#include "smg.h" struct consdev constab[]={ #if VAX8600 || VAX8200 || VAX780 || VAX750 || VAX650 || VAX630 || VAX660 || \ @@ -282,19 +276,10 @@ struct consdev constab[]={ (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) nullop, \ (dev_type_mmap((*))) enodev } -cdev_decl(cn); -cdev_decl(ctty); #define mmread mmrw #define mmwrite 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(hp); cdev_decl(rk); @@ -312,14 +297,8 @@ cdev_decl(rx); #if 0 cdev_decl(rl); #endif -cdev_decl(ccd); -cdev_decl(raid); cdev_decl(hd); cdev_decl(ry); -cdev_decl(sd); -cdev_decl(st); - -cdev_decl(rd); #include "ct.h" cdev_decl(ct); @@ -404,30 +383,18 @@ cdev_decl(dl); #endif cdev_decl(ii); -cdev_decl(vnd); - #include "bpfilter.h" -cdev_decl(bpf); #include "tun.h" -cdev_decl(tun); -cdev_decl(cd); #include "ch.h" -cdev_decl(ch); #include "ss.h" -cdev_decl(ss); #include "uk.h" -cdev_decl(uk); - -bdev_decl(rd); #ifdef XFS #include <xfs/nxfs.h> cdev_decl(xfs_dev); #endif -dev_decl(filedesc,open); - #include "wsdisplay.h" #include "wskbd.h" #include "wsmouse.h" |