diff options
| author | bouyer <bouyer@NetBSD.org> | 2017-12-10 17:03:07 +0000 |
|---|---|---|
| committer | bouyer <bouyer@NetBSD.org> | 2017-12-10 17:03:07 +0000 |
| commit | dc9bc4742b8923d82c37b257e2f8581d35e2f4f8 (patch) | |
| tree | 21a99cfe05c01fcaed49463363f8f26796e1fdfa /sys/dev/bluetooth | |
| parent | 52c1bd9af47066409417ec0463ae41e6cce0b30a (diff) | |
Factor out bus-independant HID code so that it can be shared by USB, bluetooth
and i2c.
dev/usb/ukbdmap.c is renamed to dev/hid/hidkbdmap.c
dev/usb/hid.[ch] moved to dev/hid/
usage pages moved from dev/usb/usbhid.h moved to dev/hid/hid.h,
and updated with OpenBSD entries.
bus-independant code moved from dev/usb/ums.c to dev/hid/hidms.c
(the same should be done for keyboard and touchpad drivers)
Needed for the upcoming HID over I2C support, proposed on tech-kern@
on Dec, 1.
Diffstat (limited to 'sys/dev/bluetooth')
| -rw-r--r-- | sys/dev/bluetooth/bthidev.c | 6 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btkbd.c | 10 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btmagic.c | 6 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btms.c | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/bluetooth/bthidev.c b/sys/dev/bluetooth/bthidev.c index 9089d821a24..8c01e1e8a75 100644 --- a/sys/dev/bluetooth/bthidev.c +++ b/sys/dev/bluetooth/bthidev.c @@ -1,4 +1,4 @@ -/* $NetBSD: bthidev.c,v 1.29 2014/08/05 07:55:31 rtr Exp $ */ +/* $NetBSD: bthidev.c,v 1.30 2017/12/10 17:03:07 bouyer Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.29 2014/08/05 07:55:31 rtr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.30 2017/12/10 17:03:07 bouyer Exp $"); #include <sys/param.h> #include <sys/condvar.h> @@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.29 2014/08/05 07:55:31 rtr Exp $"); #include <netbt/bluetooth.h> #include <netbt/l2cap.h> -#include <dev/usb/hid.h> +#include <dev/hid/hid.h> #include <dev/bluetooth/btdev.h> #include <dev/bluetooth/bthid.h> #include <dev/bluetooth/bthidev.h> diff --git a/sys/dev/bluetooth/btkbd.c b/sys/dev/bluetooth/btkbd.c index f5a27de8000..ee0c7098d98 100644 --- a/sys/dev/bluetooth/btkbd.c +++ b/sys/dev/bluetooth/btkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: btkbd.c,v 1.17 2014/11/16 16:20:00 ozaki-r Exp $ */ +/* $NetBSD: btkbd.c,v 1.18 2017/12/10 17:03:07 bouyer Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.17 2014/11/16 16:20:00 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.18 2017/12/10 17:03:07 bouyer Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.17 2014/11/16 16:20:00 ozaki-r Exp $"); #include <dev/bluetooth/bthid.h> #include <dev/bluetooth/bthidev.h> -#include <dev/usb/hid.h> +#include <dev/hid/hid.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> @@ -163,10 +163,10 @@ static const struct wskbd_accessops btkbd_accessops = { }; /* wskbd(4) keymap data */ -extern const struct wscons_keydesc ukbd_keydesctab[]; +extern const struct wscons_keydesc hidkbd_keydesctab[]; const struct wskbd_mapdata btkbd_keymapdata = { - ukbd_keydesctab, + hidkbd_keydesctab, #if defined(BTKBD_LAYOUT) BTKBD_LAYOUT, #elif defined(PCKBD_LAYOUT) diff --git a/sys/dev/bluetooth/btmagic.c b/sys/dev/bluetooth/btmagic.c index e6019007e84..b64ee6d1f01 100644 --- a/sys/dev/bluetooth/btmagic.c +++ b/sys/dev/bluetooth/btmagic.c @@ -1,4 +1,4 @@ -/* $NetBSD: btmagic.c,v 1.16 2016/07/07 06:55:41 msaitoh Exp $ */ +/* $NetBSD: btmagic.c,v 1.17 2017/12/10 17:03:07 bouyer Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -85,7 +85,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.16 2016/07/07 06:55:41 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.17 2017/12/10 17:03:07 bouyer Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.16 2016/07/07 06:55:41 msaitoh Exp $") #include <dev/bluetooth/bthid.h> #include <dev/bluetooth/bthidev.h> -#include <dev/usb/hid.h> +#include <dev/hid/hid.h> #include <dev/usb/usb.h> #include <dev/usb/usbdevs.h> diff --git a/sys/dev/bluetooth/btms.c b/sys/dev/bluetooth/btms.c index 62788164abe..b19d481938a 100644 --- a/sys/dev/bluetooth/btms.c +++ b/sys/dev/bluetooth/btms.c @@ -1,4 +1,4 @@ -/* $NetBSD: btms.c,v 1.12 2014/12/13 19:28:55 nonaka Exp $ */ +/* $NetBSD: btms.c,v 1.13 2017/12/10 17:03:07 bouyer Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.12 2014/12/13 19:28:55 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.13 2017/12/10 17:03:07 bouyer Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.12 2014/12/13 19:28:55 nonaka Exp $"); #include <dev/bluetooth/bthid.h> #include <dev/bluetooth/bthidev.h> -#include <dev/usb/hid.h> +#include <dev/hid/hid.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> |
