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/i386/isa/if_cx.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'sys/i386/isa/if_cx.c') diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c index 260a1c2..e29fb51 100644 --- a/sys/i386/isa/if_cx.c +++ b/sys/i386/isa/if_cx.c @@ -20,8 +20,6 @@ #include "cx.h" #include "bpf.h" -#include "opt_devfs.h" - #include "sppp.h" #if NSPPP <= 0 #error The device 'cx' requires sppp. @@ -43,10 +41,6 @@ #endif #include -#ifdef DEVFS -extern struct cdevsw cx_cdevsw; -#include -#endif /*DEVFS*/ #define watchdog_func_t void(*)(struct ifnet *) #define start_func_t void(*)(struct ifnet*) @@ -216,10 +210,6 @@ cxprobe (struct isa_device *id) * The adapter is present, initialize the driver structures. */ -#ifdef DEVFS -static void *cx_devfs_token; -#endif - static int cxattach (struct isa_device *id) { @@ -300,10 +290,11 @@ cxattach (struct isa_device *id) timeout (cxtimeout, 0, hz*5); printf ("cx%d: \n", unit, b->name); -#ifdef DEVFS - cx_devfs_token = - devfs_add_devswf(&cx_cdevsw, 0, DV_CHR, 0, 0, 0600, "cx"); -#endif + { + extern struct cdevsw cx_cdevsw; + + make_dev(&cx_cdevsw, 0, 0, 0, 0600, "cx"); + } return (1); } -- cgit v1.1