diff options
| author | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
| commit | 663cbe4fc26065f7af7d10faaee492a626156145 (patch) | |
| tree | 32e619fadb473bfb85ff8e06044176f2ff323cce /sys/isa/psm.c | |
| parent | 2a5ff1f726f814a9e4717afe3f14250f8030cace (diff) | |
| download | FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.zip FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.tar.gz | |
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().
Diffstat (limited to 'sys/isa/psm.c')
| -rw-r--r-- | sys/isa/psm.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sys/isa/psm.c b/sys/isa/psm.c index bdc39dc..e7c82c9 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.15 1999/08/17 12:14:13 yokota Exp $ + * $Id: psm.c,v 1.16 1999/08/22 06:11:52 yokota Exp $ */ /* @@ -65,7 +65,6 @@ #ifdef __i386__ #include "apm.h" #endif -#include "opt_devfs.h" #include "opt_psm.h" #if NPSM > 0 @@ -81,9 +80,6 @@ #include <sys/malloc.h> #include <machine/bus.h> #include <sys/rman.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <sys/select.h> #include <sys/uio.h> @@ -181,10 +177,6 @@ struct psm_softc { /* Driver status information */ int button; /* the latest button state */ int xold; /* previous absolute X position */ int yold; /* previous absolute Y position */ -#ifdef DEVFS - void *devfs_token; - void *b_devfs_token; -#endif #ifdef PSM_HOOKAPM struct apmhook resumehook; #endif @@ -1094,14 +1086,8 @@ psmattach(device_t dev) sc->state = PSM_VALID; /* Done */ -#ifdef DEVFS - sc->devfs_token = - devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, FALSE), - DV_CHR, 0, 0, 0666, "psm%d", unit); - sc->b_devfs_token = - devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, TRUE), - DV_CHR, 0, 0, 0666, "bpsm%d", unit); -#endif /* DEVFS */ + make_dev(&psm_cdevsw, PSM_MKMINOR(unit, FALSE), 0, 0, 0666, "psm%d", unit); + make_dev(&psm_cdevsw, PSM_MKMINOR(unit, TRUE), 0, 0, 0666, "bpsm%d", unit); #ifdef PSM_HOOKAPM sc->resumehook.ah_name = "PS/2 mouse"; |
