diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
| commit | 9dcbe2404a244059708f3bbc8cbfa0a14887c4ea (patch) | |
| tree | 627cf9c78fb38268a3abc09deb78d86c316d87e6 /sys/kern/kern_descrip.c | |
| parent | d9183205179005f7582d41a23d4588b0b1140298 (diff) | |
| download | src-9dcbe2404a244059708f3bbc8cbfa0a14887c4ea.tar.gz src-9dcbe2404a244059708f3bbc8cbfa0a14887c4ea.zip | |
Convert DEVFS hooks in (most) drivers to make_dev().
Diskslice/label code not yet handled.
Vinum, i4b, alpha, pc98 not dealt with (left to respective Maintainers)
Add the correct hook for devfs to kern_conf.c
The net result of this excercise is that a lot less files depends on DEVFS,
and devtoname() gets more sensible output in many cases.
A few drivers had minor additional cleanups performed relating to cdevsw
registration.
A few drivers don't register a cdevsw{} anymore, but only use make_dev().
Notes
Notes:
svn path=/head/; revision=50254
Diffstat (limited to 'sys/kern/kern_descrip.c')
| -rw-r--r-- | sys/kern/kern_descrip.c | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index c90ce1127540..653259694fb3 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,12 +36,10 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.64 1999/06/07 20:37:27 msmith Exp $ + * $Id: kern_descrip.c,v 1.65 1999/08/04 18:53:44 green Exp $ */ #include "opt_compat.h" -#include "opt_devfs.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -65,10 +63,6 @@ #include <vm/vm.h> #include <vm/vm_extern.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif /*DEVFS*/ - static MALLOC_DEFINE(M_FILEDESC, "file desc", "Open file descriptor table"); MALLOC_DEFINE(M_FILE, "file", "Open file structure"); static MALLOC_DEFINE(M_SIGIO, "sigio", "sigio structures"); @@ -1292,43 +1286,18 @@ SYSCTL_INT(_kern, KERN_MAXFILESPERPROC, maxfilesperproc, CTLFLAG_RW, SYSCTL_INT(_kern, KERN_MAXFILES, maxfiles, CTLFLAG_RW, &maxfiles, 0, "Maximum number of files"); -static int fildesc_devsw_installed; -#ifdef DEVFS -static void *devfs_token_stdin; -static void *devfs_token_stdout; -static void *devfs_token_stderr; -static void *devfs_token_fildesc[NUMFDESC]; -#endif - -static void fildesc_drvinit(void *unused) +static void +fildesc_drvinit(void *unused) { -#ifdef DEVFS int fd; -#endif - if( ! fildesc_devsw_installed ) { - cdevsw_add(&fildesc_cdevsw); - fildesc_devsw_installed = 1; -#ifdef DEVFS - for (fd = 0; fd < NUMFDESC; fd++) - devfs_token_fildesc[fd] = - devfs_add_devswf(&fildesc_cdevsw, fd, DV_CHR, - UID_BIN, GID_BIN, 0666, - "fd/%d", fd); - devfs_token_stdin = - devfs_add_devswf(&fildesc_cdevsw, 0, DV_CHR, - UID_ROOT, GID_WHEEL, 0666, - "stdin"); - devfs_token_stdout = - devfs_add_devswf(&fildesc_cdevsw, 1, DV_CHR, - UID_ROOT, GID_WHEEL, 0666, - "stdout"); - devfs_token_stderr = - devfs_add_devswf(&fildesc_cdevsw, 2, DV_CHR, - UID_ROOT, GID_WHEEL, 0666, - "stderr"); -#endif - } + cdevsw_add(&fildesc_cdevsw); + for (fd = 0; fd < NUMFDESC; fd++) + make_dev(&fildesc_cdevsw, fd, + UID_BIN, GID_BIN, 0666, "fd/%d", fd); + make_dev(&fildesc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0666, "stdin"); + make_dev(&fildesc_cdevsw, 1, UID_ROOT, GID_WHEEL, 0666, "stdout"); + make_dev(&fildesc_cdevsw, 2, UID_ROOT, GID_WHEEL, 0666, "stderr"); } struct fileops badfileops = { |