From 663cbe4fc26065f7af7d10faaee492a626156145 Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 23 Aug 1999 20:59:21 +0000 Subject: 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(). --- sys/amd64/amd64/mem.c | 73 ++++++++------------------------------------------- 1 file changed, 11 insertions(+), 62 deletions(-) (limited to 'sys/amd64') diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index 02827d0..4c37086 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -38,23 +38,19 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.62 1999/05/30 16:52:04 phk Exp $ + * $Id: mem.c,v 1.63 1999/05/31 11:25:44 phk Exp $ */ /* * Memory special file */ -#include "opt_devfs.h" #include "opt_perfmon.h" #include #include #include #include -#ifdef DEVFS -#include -#endif /* DEVFS */ #include #include #include @@ -118,51 +114,6 @@ static int random_ioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); struct mem_range_softc mem_range_softc; -#ifdef DEVFS -static void *mem_devfs_token; -static void *kmem_devfs_token; -static void *null_devfs_token; -static void *random_devfs_token; -static void *urandom_devfs_token; -static void *zero_devfs_token; -static void *io_devfs_token; -#ifdef PERFMON -static void *perfmon_devfs_token; -#endif - -static void memdevfs_init __P((void)); - -static void -memdevfs_init() -{ - mem_devfs_token = - devfs_add_devswf(&mem_cdevsw, 0, DV_CHR, - UID_ROOT, GID_KMEM, 0640, "mem"); - kmem_devfs_token = - devfs_add_devswf(&mem_cdevsw, 1, DV_CHR, - UID_ROOT, GID_KMEM, 0640, "kmem"); - null_devfs_token = - devfs_add_devswf(&mem_cdevsw, 2, DV_CHR, - UID_ROOT, GID_WHEEL, 0666, "null"); - random_devfs_token = - devfs_add_devswf(&mem_cdevsw, 3, DV_CHR, - UID_ROOT, GID_WHEEL, 0644, "random"); - urandom_devfs_token = - devfs_add_devswf(&mem_cdevsw, 4, DV_CHR, - UID_ROOT, GID_WHEEL, 0644, "urandom"); - zero_devfs_token = - devfs_add_devswf(&mem_cdevsw, 12, DV_CHR, - UID_ROOT, GID_WHEEL, 0666, "zero"); - io_devfs_token = - devfs_add_devswf(&mem_cdevsw, 14, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, "io"); -#ifdef PERFMON - perfmon_devfs_token = - devfs_add_devswf(&mem_cdevsw, 32, DV_CHR, - UID_ROOT, GID_KMEM, 0640, "perfmon"); -#endif /* PERFMON */ -} -#endif /* DEVFS */ static int mmclose(dev, flags, fmt, p) @@ -661,10 +612,6 @@ iszerodev(dev) && minor(dev) == 12); } - - -static int mem_devsw_installed; - static void mem_drvinit(void *unused) { @@ -673,14 +620,16 @@ mem_drvinit(void *unused) if (mem_range_softc.mr_op != NULL) mem_range_softc.mr_op->init(&mem_range_softc); - /* device registration */ - if( ! mem_devsw_installed ) { - cdevsw_add(&mem_cdevsw); - mem_devsw_installed = 1; -#ifdef DEVFS - memdevfs_init(); -#endif - } + make_dev(&mem_cdevsw, 0, UID_ROOT, GID_KMEM, 0640, "mem"); + make_dev(&mem_cdevsw, 1, UID_ROOT, GID_KMEM, 0640, "kmem"); + make_dev(&mem_cdevsw, 2, UID_ROOT, GID_WHEEL, 0666, "null"); + make_dev(&mem_cdevsw, 3, UID_ROOT, GID_WHEEL, 0644, "random"); + make_dev(&mem_cdevsw, 4, UID_ROOT, GID_WHEEL, 0644, "urandom"); + make_dev(&mem_cdevsw, 12, UID_ROOT, GID_WHEEL, 0666, "zero"); + make_dev(&mem_cdevsw, 14, UID_ROOT, GID_WHEEL, 0600, "io"); +#ifdef PERFMON + make_dev(&mem_cdevsw, 32, UID_ROOT, GID_KMEM, 0640, "perfmon"); +#endif /* PERFMON */ } SYSINIT(memdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,mem_drvinit,NULL) -- cgit v1.1