diff options
| author | ad <ad@NetBSD.org> | 2007-07-09 20:51:58 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2007-07-09 20:51:58 +0000 |
| commit | 88ab7da936c561aba9ff7492617ffb08f8d08ece (patch) | |
| tree | d9d78b17ff651178241606f2e7766abdd0f15137 /sys/dev/bluetooth | |
| parent | 317bac119f13240650ea6882854b381cf1024fa1 (diff) | |
Merge some of the less invasive changes from the vmlocking branch:
- kthread, callout, devsw API changes
- select()/poll() improvements
- miscellaneous MT safety improvements
Diffstat (limited to 'sys/dev/bluetooth')
| -rw-r--r-- | sys/dev/bluetooth/bthidev.c | 6 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btkbd.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/bluetooth/bthidev.c b/sys/dev/bluetooth/bthidev.c index 85fdef68e68..ec8cd8d9e61 100644 --- a/sys/dev/bluetooth/bthidev.c +++ b/sys/dev/bluetooth/bthidev.c @@ -1,4 +1,4 @@ -/* $NetBSD: bthidev.c,v 1.8 2007/04/21 06:15:22 plunky Exp $ */ +/* $NetBSD: bthidev.c,v 1.9 2007/07/09 21:00:31 ad Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.8 2007/04/21 06:15:22 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.9 2007/07/09 21:00:31 ad Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -186,7 +186,7 @@ bthidev_attach(struct device *parent, struct device *self, void *aux) * Init softc */ LIST_INIT(&sc->sc_list); - callout_init(&sc->sc_reconnect); + callout_init(&sc->sc_reconnect, 0); callout_setfunc(&sc->sc_reconnect, bthidev_timeout, sc); sc->sc_state = BTHID_CLOSED; sc->sc_flags = BTHID_CONNECTING; diff --git a/sys/dev/bluetooth/btkbd.c b/sys/dev/bluetooth/btkbd.c index 6bdc8d35625..ea3203333f4 100644 --- a/sys/dev/bluetooth/btkbd.c +++ b/sys/dev/bluetooth/btkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: btkbd.c,v 1.6 2007/03/04 06:01:45 christos Exp $ */ +/* $NetBSD: btkbd.c,v 1.7 2007/07/09 21:00:31 ad Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.6 2007/03/04 06:01:45 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.7 2007/07/09 21:00:31 ad Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -197,7 +197,7 @@ btkbd_attach(struct device *parent, struct device *self, void *aux) #ifdef WSDISPLAY_COMPAT_RAWKBD #ifdef BTKBD_REPEAT - callout_init(&sc->sc_repeat); + callout_init(&sc->sc_repeat, 0); callout_setfunc(&sc->sc_repeat, btkbd_repeat, sc); #endif #endif |
