summaryrefslogtreecommitdiff
path: root/sys/dev/joy
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1999-05-31 11:29:30 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1999-05-31 11:29:30 +0000
commit2447bec8293649f281b5f9926a7cd4097ccaf4bf (patch)
treef7694bd7dc78280030c80d074ef35b7f539ff9ca /sys/dev/joy
parentdb453b16791eca0888057e429ec55ab2c1e14af9 (diff)
Notes
Diffstat (limited to 'sys/dev/joy')
-rw-r--r--sys/dev/joy/joy.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 6847f43d41222..a2edbd5f0690f 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -120,6 +120,10 @@ static int get_tick __P((void));
static int
joyprobe (struct isa_device *dev)
{
+ static int once;
+
+ if (!once++)
+ cdevsw_add(&joy_cdevsw);
#ifdef WANT_JOYSTICK_CONNECTED
outb (dev->id_iobase, 0xff);
DELAY (10000); /* 10 ms delay */
@@ -251,22 +255,6 @@ get_tick ()
return (high << 8) | low;
}
-
-static int joy_devsw_installed;
-
-static void joy_drvinit(void *unused)
-{
- dev_t dev;
-
- if( ! joy_devsw_installed ) {
- dev = makedev(CDEV_MAJOR,0);
- cdevsw_add(&dev,&joy_cdevsw,NULL);
- joy_devsw_installed = 1;
- }
-}
-
-SYSINIT(joydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,joy_drvinit,NULL)
-
#ifdef JOY_MODULE
#include <sys/exec.h>