* [PATCH 01/21] hog: Register HID over GATT device driver
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
@ 2012-07-03 18:42 ` João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 02/21] hog: Add checking for 'EnableGatt' João Paulo Rechi Vita
` (20 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Claudio Takahasi
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
---
Makefile.am | 5 +++++
acinclude.m4 | 1 +
input/hog_device.h | 25 +++++++++++++++++++++++++
input/main.c | 13 +++++++++++++
input/manager.c | 34 ++++++++++++++++++++++++++++++++++
input/manager.h | 3 +++
6 files changed, 81 insertions(+)
create mode 100644 input/hog_device.h
diff --git a/Makefile.am b/Makefile.am
index 7415979..8c6335c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,6 +186,11 @@ builtin_sources += input/main.c \
input/fakehid.c input/fakehid.h
endif
+if HOGPLUGIN
+builtin_modules += hog
+builtin_sources += input/hog_device.h
+endif
+
if SERIALPLUGIN
builtin_modules += serial
builtin_sources += serial/main.c \
diff --git a/acinclude.m4 b/acinclude.m4
index ab0ebba..3247036 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -384,4 +384,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes")
AM_CONDITIONAL(GATTMODULES, test "${gatt_enable}" = "yes")
+ AM_CONDITIONAL(HOGPLUGIN, test "${gatt_enable}" = "yes" && test "${input_enable}" = "yes")
])
diff --git a/input/hog_device.h b/input/hog_device.h
new file mode 100644
index 0000000..a0158ea
--- /dev/null
+++ b/input/hog_device.h
@@ -0,0 +1,25 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2012 Marcel Holtmann <marcel@holtmann.org>
+ * Copyright (C) 2012 Instituto Nokia de Tecnologia - INdT
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#define HOG_UUID "00001812-0000-1000-8000-00805f9b34fb"
diff --git a/input/main.c b/input/main.c
index da09b86..2aac3db 100644
--- a/input/main.c
+++ b/input/main.c
@@ -84,3 +84,16 @@ static void input_exit(void)
BLUETOOTH_PLUGIN_DEFINE(input, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
input_init, input_exit)
+
+static int hog_init(void)
+{
+ return hog_manager_init();
+}
+
+static void hog_exit(void)
+{
+ hog_manager_exit();
+}
+
+BLUETOOTH_PLUGIN_DEFINE(hog, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
+ hog_init, hog_exit)
diff --git a/input/manager.c b/input/manager.c
index 5cc552b..8da9f64 100644
--- a/input/manager.c
+++ b/input/manager.c
@@ -40,6 +40,7 @@
#include "../src/device.h"
#include "device.h"
+#include "hog_device.h"
#include "server.h"
#include "manager.h"
@@ -195,3 +196,36 @@ void input_manager_exit(void)
connection = NULL;
}
+
+static int hog_device_probe(struct btd_device *device, GSList *uuids)
+{
+ const char *path = device_get_path(device);
+
+ DBG("path %s", path);
+
+ return 0;
+}
+
+static void hog_device_remove(struct btd_device *device)
+{
+ const gchar *path = device_get_path(device);
+
+ DBG("path %s", path);
+}
+
+static struct btd_device_driver hog_driver = {
+ .name = "input-hog",
+ .uuids = BTD_UUIDS(HOG_UUID),
+ .probe = hog_device_probe,
+ .remove = hog_device_remove,
+};
+
+int hog_manager_init(void)
+{
+ return btd_register_device_driver(&hog_driver);
+}
+
+void hog_manager_exit(void)
+{
+ btd_unregister_device_driver(&hog_driver);
+}
diff --git a/input/manager.h b/input/manager.h
index 7b93c5b..468de64 100644
--- a/input/manager.h
+++ b/input/manager.h
@@ -23,3 +23,6 @@
int input_manager_init(DBusConnection *conn, GKeyFile *config);
void input_manager_exit(void);
+
+int hog_manager_init(void);
+void hog_manager_exit(void);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 02/21] hog: Add checking for 'EnableGatt'
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 01/21] hog: Register HID over GATT device driver João Paulo Rechi Vita
@ 2012-07-03 18:42 ` João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 03/21] hog: Register ATTIO callbacks João Paulo Rechi Vita
` (19 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Claudio Takahasi
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
This patch adds the verification for 'EnableGatt' config option on HoG
plugin. HoG should not be enabled if EnableGatt is disabled.
---
input/main.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/input/main.c b/input/main.c
index 2aac3db..722bc49 100644
--- a/input/main.c
+++ b/input/main.c
@@ -32,6 +32,7 @@
#include <gdbus.h>
#include "plugin.h"
+#include "hcid.h"
#include "log.h"
#include "manager.h"
@@ -87,11 +88,19 @@ BLUETOOTH_PLUGIN_DEFINE(input, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
static int hog_init(void)
{
+ if (!main_opts.gatt_enabled) {
+ DBG("GATT is disabled");
+ return -ENOTSUP;
+ }
+
return hog_manager_init();
}
static void hog_exit(void)
{
+ if (!main_opts.gatt_enabled)
+ return;
+
hog_manager_exit();
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 03/21] hog: Register ATTIO callbacks
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 01/21] hog: Register HID over GATT device driver João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 02/21] hog: Add checking for 'EnableGatt' João Paulo Rechi Vita
@ 2012-07-03 18:42 ` João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 04/21] hog: Load primary service handle João Paulo Rechi Vita
` (18 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
This way the LE connection is kept up. Also set device to autoconnect.
---
Makefile.am | 2 +-
input/hog_device.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++
input/hog_device.h | 3 ++
input/manager.c | 4 +-
4 files changed, 148 insertions(+), 2 deletions(-)
create mode 100644 input/hog_device.c
diff --git a/Makefile.am b/Makefile.am
index 8c6335c..6f7719e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,7 +188,7 @@ endif
if HOGPLUGIN
builtin_modules += hog
-builtin_sources += input/hog_device.h
+builtin_sources += input/hog_device.h input/hog_device.c
endif
if SERIALPLUGIN
diff --git a/input/hog_device.c b/input/hog_device.c
new file mode 100644
index 0000000..ef382d2
--- /dev/null
+++ b/input/hog_device.c
@@ -0,0 +1,141 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2012 Marcel Holtmann <marcel@holtmann.org>
+ * Copyright (C) 2012 Instituto Nokia de Tecnologia - INdT
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <bluetooth/bluetooth.h>
+
+#include <glib.h>
+
+#include "log.h"
+
+#include "../src/adapter.h"
+#include "../src/device.h"
+
+#include "hog_device.h"
+
+#include "gattrib.h"
+#include "attio.h"
+
+struct hog_device {
+ char *path;
+ struct btd_device *device;
+ GAttrib *attrib;
+ guint attioid;
+};
+
+static GSList *devices = NULL;
+
+static void attio_connected_cb(GAttrib *attrib, gpointer user_data)
+{
+ struct hog_device *hogdev = user_data;
+
+ hogdev->attrib = g_attrib_ref(attrib);
+}
+
+static void attio_disconnected_cb(gpointer user_data)
+{
+ struct hog_device *hogdev = user_data;
+
+ g_attrib_unref(hogdev->attrib);
+ hogdev->attrib = NULL;
+}
+
+static struct hog_device *find_device_by_path(GSList *list, const char *path)
+{
+ for (; list; list = list->next) {
+ struct hog_device *hogdev = list->data;
+
+ if (!strcmp(hogdev->path, path))
+ return hogdev;
+ }
+
+ return NULL;
+}
+
+static struct hog_device *hog_device_new(struct btd_device *device,
+ const char *path)
+{
+ struct hog_device *hogdev;
+
+ hogdev = g_try_new0(struct hog_device, 1);
+ if (!hogdev)
+ return NULL;
+
+ hogdev->path = g_strdup(path);
+ hogdev->device = btd_device_ref(device);
+
+ return hogdev;
+}
+
+int hog_device_register(struct btd_device *device, const char *path)
+{
+ struct hog_device *hogdev;
+
+ hogdev = find_device_by_path(devices, path);
+ if (hogdev)
+ return -EALREADY;
+
+ hogdev = hog_device_new(device, path);
+ if (!hogdev)
+ return -ENOMEM;
+
+ hogdev->attioid = btd_device_add_attio_callback(device,
+ attio_connected_cb,
+ attio_disconnected_cb,
+ hogdev);
+ device_set_auto_connect(device, TRUE);
+
+ devices = g_slist_append(devices, hogdev);
+
+ return 0;
+}
+
+static void hog_device_free(struct hog_device *hogdev)
+{
+ btd_device_unref(hogdev->device);
+ g_free(hogdev->path);
+ g_free(hogdev);
+}
+
+int hog_device_unregister(const char *path)
+{
+ struct hog_device *hogdev;
+
+ hogdev = find_device_by_path(devices, path);
+ if (hogdev == NULL)
+ return -EINVAL;
+
+ btd_device_remove_attio_callback(hogdev->device, hogdev->attioid);
+ devices = g_slist_remove(devices, hogdev);
+ hog_device_free(hogdev);
+
+ return 0;
+}
diff --git a/input/hog_device.h b/input/hog_device.h
index a0158ea..ce6a79e 100644
--- a/input/hog_device.h
+++ b/input/hog_device.h
@@ -23,3 +23,6 @@
*/
#define HOG_UUID "00001812-0000-1000-8000-00805f9b34fb"
+
+int hog_device_register(struct btd_device *device, const char *path);
+int hog_device_unregister(const char *path);
diff --git a/input/manager.c b/input/manager.c
index 8da9f64..01f83ce 100644
--- a/input/manager.c
+++ b/input/manager.c
@@ -203,7 +203,7 @@ static int hog_device_probe(struct btd_device *device, GSList *uuids)
DBG("path %s", path);
- return 0;
+ return hog_device_register(device, path);
}
static void hog_device_remove(struct btd_device *device)
@@ -211,6 +211,8 @@ static void hog_device_remove(struct btd_device *device)
const gchar *path = device_get_path(device);
DBG("path %s", path);
+
+ hog_device_unregister(path);
}
static struct btd_device_driver hog_driver = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 04/21] hog: Load primary service handle
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (2 preceding siblings ...)
2012-07-03 18:42 ` [PATCH 03/21] hog: Register ATTIO callbacks João Paulo Rechi Vita
@ 2012-07-03 18:42 ` João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 05/21] hog: Discover all characteristics declaration João Paulo Rechi Vita
` (17 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
---
input/hog_device.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/input/hog_device.c b/input/hog_device.c
index ef382d2..1f11f34 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -31,6 +31,7 @@
#include <unistd.h>
#include <bluetooth/bluetooth.h>
+#include <bluetooth/uuid.h>
#include <glib.h>
@@ -41,14 +42,17 @@
#include "hog_device.h"
+#include "att.h"
#include "gattrib.h"
#include "attio.h"
+#include "gatt.h"
struct hog_device {
char *path;
struct btd_device *device;
GAttrib *attrib;
guint attioid;
+ struct gatt_primary *hog_primary;
};
static GSList *devices = NULL;
@@ -95,18 +99,44 @@ static struct hog_device *hog_device_new(struct btd_device *device,
return hogdev;
}
+static gint primary_uuid_cmp(gconstpointer a, gconstpointer b)
+{
+ const struct gatt_primary *prim = a;
+ const char *uuid = b;
+
+ return g_strcmp0(prim->uuid, uuid);
+}
+
+static struct gatt_primary *load_hog_primary(struct btd_device *device)
+{
+ GSList *primaries, *l;
+
+ primaries = btd_device_get_primaries(device);
+
+ l = g_slist_find_custom(primaries, HOG_UUID, primary_uuid_cmp);
+
+ return (l ? l->data : NULL);
+}
+
int hog_device_register(struct btd_device *device, const char *path)
{
struct hog_device *hogdev;
+ struct gatt_primary *prim;
hogdev = find_device_by_path(devices, path);
if (hogdev)
return -EALREADY;
+ prim = load_hog_primary(device);
+ if (!prim)
+ return -EINVAL;
+
hogdev = hog_device_new(device, path);
if (!hogdev)
return -ENOMEM;
+ hogdev->hog_primary = g_memdup(prim, sizeof(*prim));
+
hogdev->attioid = btd_device_add_attio_callback(device,
attio_connected_cb,
attio_disconnected_cb,
@@ -122,6 +152,7 @@ static void hog_device_free(struct hog_device *hogdev)
{
btd_device_unref(hogdev->device);
g_free(hogdev->path);
+ g_free(hogdev->hog_primary);
g_free(hogdev);
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 05/21] hog: Discover all characteristics declaration
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (3 preceding siblings ...)
2012-07-03 18:42 ` [PATCH 04/21] hog: Load primary service handle João Paulo Rechi Vita
@ 2012-07-03 18:42 ` João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 06/21] hog: Discover descriptors for all characteristics João Paulo Rechi Vita
` (16 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
HID service supports multiple report characteristic. Each report
characteristic has a reference descriptor containing ID and type.
---
input/hog_device.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/input/hog_device.c b/input/hog_device.c
index 1f11f34..786bc1b 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -47,21 +47,65 @@
#include "attio.h"
#include "gatt.h"
+#define HOG_REPORT_UUID 0x2A4D
+
+struct report {
+ struct gatt_char *decl;
+};
+
struct hog_device {
char *path;
struct btd_device *device;
GAttrib *attrib;
guint attioid;
struct gatt_primary *hog_primary;
+ GSList *reports;
};
static GSList *devices = NULL;
+static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
+{
+ struct hog_device *hogdev = user_data;
+ bt_uuid_t report_uuid;
+ struct report *report;
+ GSList *l;
+
+ if (status != 0) {
+ const char *str = att_ecode2str(status);
+ DBG("Discover all characteristics failed: %s", str);
+ return;
+ }
+
+ bt_uuid16_create(&report_uuid, HOG_REPORT_UUID);
+
+ for (l = chars; l; l = g_slist_next(l)) {
+ struct gatt_char *chr = l->data;
+ bt_uuid_t uuid;
+
+ DBG("0x%04x UUID: %s properties: %02x",
+ chr->handle, chr->uuid, chr->properties);
+
+ bt_string_to_uuid(&uuid, chr->uuid);
+
+ if (bt_uuid_cmp(&uuid, &report_uuid) != 0)
+ continue;
+
+ report = g_new0(struct report, 1);
+ report->decl = g_memdup(chr, sizeof(*chr));
+ hogdev->reports = g_slist_append(hogdev->reports, report);
+ }
+}
+
static void attio_connected_cb(GAttrib *attrib, gpointer user_data)
{
struct hog_device *hogdev = user_data;
+ struct gatt_primary *prim = hogdev->hog_primary;
hogdev->attrib = g_attrib_ref(attrib);
+
+ gatt_discover_char(hogdev->attrib, prim->range.start, prim->range.end,
+ NULL, char_discovered_cb, hogdev);
}
static void attio_disconnected_cb(gpointer user_data)
@@ -148,9 +192,17 @@ int hog_device_register(struct btd_device *device, const char *path)
return 0;
}
+static void report_free(void *data)
+{
+ struct report *report = data;
+ g_free(report->decl);
+ g_free(report);
+}
+
static void hog_device_free(struct hog_device *hogdev)
{
btd_device_unref(hogdev->device);
+ g_slist_free_full(hogdev->reports, report_free);
g_free(hogdev->path);
g_free(hogdev->hog_primary);
g_free(hogdev);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 06/21] hog: Discover descriptors for all characteristics
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (4 preceding siblings ...)
2012-07-03 18:42 ` [PATCH 05/21] hog: Discover all characteristics declaration João Paulo Rechi Vita
@ 2012-07-03 18:42 ` João Paulo Rechi Vita
2012-07-03 18:42 ` [PATCH 07/21] hog: Discover the "Report Map" characteristic João Paulo Rechi Vita
` (15 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Claudio Takahasi
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
"Report" characteristic has "Report Reference Characteristic" descriptor and
"Client Characteristic Configuration" descriptor.
---
input/hog_device.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 55 insertions(+), 1 deletion(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 786bc1b..77fe479 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -64,6 +64,55 @@ struct hog_device {
static GSList *devices = NULL;
+static void discover_descriptor_cb(guint8 status, const guint8 *pdu,
+ guint16 len, gpointer user_data)
+{
+ struct report *report = user_data;
+ struct att_data_list *list;
+ uint8_t format;
+ int i;
+
+ if (status != 0) {
+ error("Discover all characteristic descriptors failed: %s",
+ att_ecode2str(status));
+ return;
+ }
+
+ list = dec_find_info_resp(pdu, len, &format);
+ if (list == NULL)
+ return;
+
+ if (format != 0x01)
+ goto done;
+
+ for (i = 0; i < list->num; i++) {
+ uint16_t uuid16;
+ uint8_t *value;
+
+ value = list->data[i];
+ uuid16 = att_get_u16(&value[2]);
+
+ DBG("%s descriptor: 0x%04x", report->decl->uuid, uuid16);
+ }
+
+done:
+ att_data_list_free(list);
+}
+
+static void discover_descriptor(GAttrib *attrib, struct gatt_char *chr,
+ struct gatt_char *next, gpointer user_data)
+{
+ uint16_t start, end;
+
+ start = chr->value_handle + 1;
+ end = (next ? next->handle - 1 : 0xffff);
+
+ if (start > end)
+ return;
+
+ gatt_find_info(attrib, start, end, discover_descriptor_cb, user_data);
+}
+
static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
{
struct hog_device *hogdev = user_data;
@@ -80,9 +129,12 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
bt_uuid16_create(&report_uuid, HOG_REPORT_UUID);
for (l = chars; l; l = g_slist_next(l)) {
- struct gatt_char *chr = l->data;
+ struct gatt_char *chr, *next;
bt_uuid_t uuid;
+ chr = l->data;
+ next = l->next ? l->next->data : NULL;
+
DBG("0x%04x UUID: %s properties: %02x",
chr->handle, chr->uuid, chr->properties);
@@ -94,6 +146,8 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
report = g_new0(struct report, 1);
report->decl = g_memdup(chr, sizeof(*chr));
hogdev->reports = g_slist_append(hogdev->reports, report);
+
+ discover_descriptor(hogdev->attrib, chr, next, hogdev);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 07/21] hog: Discover the "Report Map" characteristic
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (5 preceding siblings ...)
2012-07-03 18:42 ` [PATCH 06/21] hog: Discover descriptors for all characteristics João Paulo Rechi Vita
@ 2012-07-03 18:42 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 08/21] hog: Enable "Report" characteristic notifications João Paulo Rechi Vita
` (14 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
This characteristic contains the HID descriptor.
---
input/hog_device.c | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 41 insertions(+), 9 deletions(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 77fe479..fdf76cd 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -47,8 +47,11 @@
#include "attio.h"
#include "gatt.h"
+#define HOG_REPORT_MAP_UUID 0x2A4B
#define HOG_REPORT_UUID 0x2A4D
+#define HOG_REPORT_MAP_MAX_SIZE 512
+
struct report {
struct gatt_char *decl;
};
@@ -113,10 +116,37 @@ static void discover_descriptor(GAttrib *attrib, struct gatt_char *chr,
gatt_find_info(attrib, start, end, discover_descriptor_cb, user_data);
}
+static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ gpointer user_data)
+{
+ uint8_t value[HOG_REPORT_MAP_MAX_SIZE];
+ ssize_t vlen;
+ int i;
+
+ if (status != 0) {
+ error("Report Map read failed: %s", att_ecode2str(status));
+ return;
+ }
+
+ vlen = dec_read_resp(pdu, plen, value, sizeof(value));
+ if (vlen < 0) {
+ error("ATT protocol error");
+ return;
+ }
+
+ DBG("Report MAP:");
+ for (i = 0; i < vlen; i += 2) {
+ if (i + 1 == vlen)
+ DBG("\t %02x", value[i]);
+ else
+ DBG("\t %02x %02x", value[i], value[i + 1]);
+ }
+}
+
static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
{
struct hog_device *hogdev = user_data;
- bt_uuid_t report_uuid;
+ bt_uuid_t report_uuid, report_map_uuid;
struct report *report;
GSList *l;
@@ -127,6 +157,7 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
}
bt_uuid16_create(&report_uuid, HOG_REPORT_UUID);
+ bt_uuid16_create(&report_map_uuid, HOG_REPORT_MAP_UUID);
for (l = chars; l; l = g_slist_next(l)) {
struct gatt_char *chr, *next;
@@ -140,14 +171,15 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
bt_string_to_uuid(&uuid, chr->uuid);
- if (bt_uuid_cmp(&uuid, &report_uuid) != 0)
- continue;
-
- report = g_new0(struct report, 1);
- report->decl = g_memdup(chr, sizeof(*chr));
- hogdev->reports = g_slist_append(hogdev->reports, report);
-
- discover_descriptor(hogdev->attrib, chr, next, hogdev);
+ if (bt_uuid_cmp(&uuid, &report_uuid) == 0) {
+ report = g_new0(struct report, 1);
+ report->decl = g_memdup(chr, sizeof(*chr));
+ hogdev->reports = g_slist_append(hogdev->reports,
+ report);
+ discover_descriptor(hogdev->attrib, chr, next, hogdev);
+ } else if (bt_uuid_cmp(&uuid, &report_map_uuid) == 0)
+ gatt_read_char(hogdev->attrib, chr->value_handle, 0,
+ report_map_read_cb, hogdev);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 08/21] hog: Enable "Report" characteristic notifications
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (6 preceding siblings ...)
2012-07-03 18:42 ` [PATCH 07/21] hog: Discover the "Report Map" characteristic João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 09/21] hog: Add report notification handler João Paulo Rechi Vita
` (13 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
---
input/hog_device.c | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index fdf76cd..1883728 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -67,10 +67,30 @@ struct hog_device {
static GSList *devices = NULL;
+static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
+ guint16 plen, gpointer user_data)
+{
+ if (status != 0) {
+ error("Write report characteristic descriptor failed: %s",
+ att_ecode2str(status));
+ return;
+ }
+
+ DBG("Report characteristic descriptor written: notifications enabled");
+}
+
+static void write_ccc(uint16_t handle, gpointer user_data)
+{
+ struct hog_device *hogdev = user_data;
+ uint8_t value[] = { 0x01, 0x00 };
+
+ gatt_write_char(hogdev->attrib, handle, value, sizeof(value),
+ report_ccc_written_cb, hogdev);
+}
+
static void discover_descriptor_cb(guint8 status, const guint8 *pdu,
guint16 len, gpointer user_data)
{
- struct report *report = user_data;
struct att_data_list *list;
uint8_t format;
int i;
@@ -89,13 +109,17 @@ static void discover_descriptor_cb(guint8 status, const guint8 *pdu,
goto done;
for (i = 0; i < list->num; i++) {
- uint16_t uuid16;
+ uint16_t uuid16, handle;
uint8_t *value;
value = list->data[i];
+ handle = att_get_u16(value);
uuid16 = att_get_u16(&value[2]);
- DBG("%s descriptor: 0x%04x", report->decl->uuid, uuid16);
+ if (uuid16 != GATT_CLIENT_CHARAC_CFG_UUID)
+ continue;
+
+ write_ccc(handle, user_data);
}
done:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 09/21] hog: Add report notification handler
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (7 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 08/21] hog: Enable "Report" characteristic notifications João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 10/21] hog: HID I/O driver João Paulo Rechi Vita
` (12 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
---
input/hog_device.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/input/hog_device.c b/input/hog_device.c
index 1883728..8e5e758 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -61,12 +61,26 @@ struct hog_device {
struct btd_device *device;
GAttrib *attrib;
guint attioid;
+ guint report_cb_id;
struct gatt_primary *hog_primary;
GSList *reports;
};
static GSList *devices = NULL;
+static void report_value_cb(const uint8_t *pdu, uint16_t len, gpointer user_data)
+{
+ uint16_t handle;
+
+ if (len < 3) { /* 1-byte opcode + 2-byte handle */
+ error("Malformed ATT notification");
+ return;
+ }
+
+ handle = att_get_u16(&pdu[1]);
+ DBG("Report notification on handle 0x%04x", handle);
+}
+
static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
guint16 plen, gpointer user_data)
{
@@ -216,12 +230,19 @@ static void attio_connected_cb(GAttrib *attrib, gpointer user_data)
gatt_discover_char(hogdev->attrib, prim->range.start, prim->range.end,
NULL, char_discovered_cb, hogdev);
+
+ hogdev->report_cb_id = g_attrib_register(hogdev->attrib,
+ ATT_OP_HANDLE_NOTIFY, report_value_cb,
+ hogdev, NULL);
}
static void attio_disconnected_cb(gpointer user_data)
{
struct hog_device *hogdev = user_data;
+ g_attrib_unregister(hogdev->attrib, hogdev->report_cb_id);
+ hogdev->report_cb_id = 0;
+
g_attrib_unref(hogdev->attrib);
hogdev->attrib = NULL;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 10/21] hog: HID I/O driver
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (8 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 09/21] hog: Add report notification handler João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 11/21] hog: Use real values for vendor and product IDs João Paulo Rechi Vita
` (11 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
uHID is HID I/O driver that makes possible to implement HID I/O drivers in
user-space. It works similar to the uinput but it is initialized with a HID
descriptor and deals with raw HID reports.
This commit uses uHID to create a HID device for the remote HoG device and
to tranfers HID reports to HID subsystem.
---
acinclude.m4 | 9 +++++-
configure.ac | 2 ++
input/hog_device.c | 89 +++++++++++++++++++++++++++++++++++++++++-----------
input/main.c | 2 ++
input/manager.c | 2 ++
5 files changed, 84 insertions(+), 20 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 3247036..21f1a9c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -161,6 +161,13 @@ AC_DEFUN([AC_PATH_OUI], [
AC_DEFINE_UNQUOTED(OUIFILE, ["$ac_with_ouifile"], [Define the OUI file path])
])
+AC_DEFUN([AC_PATH_UHID], [
+ AC_CHECK_HEADERS(linux/uhid.h,
+ uhid_found=yes,
+ uhid_found=no
+ )
+])
+
AC_DEFUN([AC_ARG_BLUEZ], [
debug_enable=no
optimization_enable=yes
@@ -384,5 +391,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes")
AM_CONDITIONAL(GATTMODULES, test "${gatt_enable}" = "yes")
- AM_CONDITIONAL(HOGPLUGIN, test "${gatt_enable}" = "yes" && test "${input_enable}" = "yes")
+ AM_CONDITIONAL(HOGPLUGIN, test "${gatt_enable}" = "yes" && test "${input_enable}" = "yes" && test "${uhid_found}" = "yes")
])
diff --git a/configure.ac b/configure.ac
index 7f331ae..150171f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_CHECK_HEADER([sys/inotify.h],
[AC_DEFINE([HAVE_SYS_INOTIFY_H], 1,
[Define to 1 if you have <sys/inotify.h>.])],
[AC_MSG_ERROR(inotify headers are required and missing)])
+
AC_PATH_DBUS
AC_PATH_GLIB
AC_PATH_GSTREAMER
@@ -48,6 +49,7 @@ AC_PATH_SNDFILE
AC_PATH_OUI
AC_PATH_READLINE
AC_PATH_CHECK
+AC_PATH_UHID
AC_ARG_BLUEZ
diff --git a/input/hog_device.c b/input/hog_device.c
index 8e5e758..5dd9cf1 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -29,6 +29,10 @@
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <linux/uhid.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/uuid.h>
@@ -49,6 +53,7 @@
#define HOG_REPORT_MAP_UUID 0x2A4B
#define HOG_REPORT_UUID 0x2A4D
+#define UHID_DEVICE_FILE "/dev/uhid"
#define HOG_REPORT_MAP_MAX_SIZE 512
@@ -64,21 +69,32 @@ struct hog_device {
guint report_cb_id;
struct gatt_primary *hog_primary;
GSList *reports;
+ int uhid_fd;
};
static GSList *devices = NULL;
static void report_value_cb(const uint8_t *pdu, uint16_t len, gpointer user_data)
{
- uint16_t handle;
+ struct hog_device *hogdev = user_data;
+ struct uhid_event ev;
+ uint16_t report_size = len - 3;
if (len < 3) { /* 1-byte opcode + 2-byte handle */
error("Malformed ATT notification");
return;
}
- handle = att_get_u16(&pdu[1]);
- DBG("Report notification on handle 0x%04x", handle);
+ memset(&ev, 0, sizeof(ev));
+ ev.type = UHID_INPUT;
+ ev.u.input.size = MIN(report_size, UHID_DATA_MAX);
+ memcpy(ev.u.input.data, &pdu[3], MIN(report_size, UHID_DATA_MAX));
+
+ if (write(hogdev->uhid_fd, &ev, sizeof(ev)) < 0)
+ error("uHID write failed: %s", strerror(errno));
+ else
+ DBG("Report from HoG device %s written to uHID fd %d",
+ hogdev->path, hogdev->uhid_fd);
}
static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
@@ -157,7 +173,9 @@ static void discover_descriptor(GAttrib *attrib, struct gatt_char *chr,
static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
gpointer user_data)
{
+ struct hog_device *hogdev = user_data;
uint8_t value[HOG_REPORT_MAP_MAX_SIZE];
+ struct uhid_event ev;
ssize_t vlen;
int i;
@@ -179,6 +197,22 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
else
DBG("\t %02x %02x", value[i], value[i + 1]);
}
+
+ /* create uHID device */
+ memset(&ev, 0, sizeof(ev));
+ ev.type = UHID_CREATE;
+ /* TODO: get info from DIS */
+ strcpy((char *)ev.u.create.name, "bluez-hog-device");
+ ev.u.create.vendor = 0xBEBA;
+ ev.u.create.product = 0xCAFE;
+ ev.u.create.version = 0;
+ ev.u.create.country = 0;
+ ev.u.create.bus = BUS_BLUETOOTH;
+ ev.u.create.rd_data = value;
+ ev.u.create.rd_size = vlen;
+
+ if (write(hogdev->uhid_fd, &ev, sizeof(ev)) < 0)
+ error("Failed to create uHID device: %s", strerror(errno));
}
static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
@@ -239,6 +273,12 @@ static void attio_connected_cb(GAttrib *attrib, gpointer user_data)
static void attio_disconnected_cb(gpointer user_data)
{
struct hog_device *hogdev = user_data;
+ struct uhid_event ev;
+
+ memset(&ev, 0, sizeof(ev));
+ ev.type = UHID_DESTROY;
+ if (write(hogdev->uhid_fd, &ev, sizeof(ev)) < 0)
+ error("Failed to destroy uHID device: %s", strerror(errno));
g_attrib_unregister(hogdev->attrib, hogdev->report_cb_id);
hogdev->report_cb_id = 0;
@@ -293,6 +333,22 @@ static struct gatt_primary *load_hog_primary(struct btd_device *device)
return (l ? l->data : NULL);
}
+static void report_free(void *data)
+{
+ struct report *report = data;
+ g_free(report->decl);
+ g_free(report);
+}
+
+static void hog_device_free(struct hog_device *hogdev)
+{
+ btd_device_unref(hogdev->device);
+ g_slist_free_full(hogdev->reports, report_free);
+ g_free(hogdev->path);
+ g_free(hogdev->hog_primary);
+ g_free(hogdev);
+}
+
int hog_device_register(struct btd_device *device, const char *path)
{
struct hog_device *hogdev;
@@ -310,6 +366,13 @@ int hog_device_register(struct btd_device *device, const char *path)
if (!hogdev)
return -ENOMEM;
+ hogdev->uhid_fd = open(UHID_DEVICE_FILE, O_RDWR | O_CLOEXEC);
+ if (hogdev->uhid_fd < 0) {
+ error("Failed to open uHID device: %s", strerror(errno));
+ hog_device_free(hogdev);
+ return -errno;
+ }
+
hogdev->hog_primary = g_memdup(prim, sizeof(*prim));
hogdev->attioid = btd_device_add_attio_callback(device,
@@ -323,22 +386,6 @@ int hog_device_register(struct btd_device *device, const char *path)
return 0;
}
-static void report_free(void *data)
-{
- struct report *report = data;
- g_free(report->decl);
- g_free(report);
-}
-
-static void hog_device_free(struct hog_device *hogdev)
-{
- btd_device_unref(hogdev->device);
- g_slist_free_full(hogdev->reports, report_free);
- g_free(hogdev->path);
- g_free(hogdev->hog_primary);
- g_free(hogdev);
-}
-
int hog_device_unregister(const char *path)
{
struct hog_device *hogdev;
@@ -348,6 +395,10 @@ int hog_device_unregister(const char *path)
return -EINVAL;
btd_device_remove_attio_callback(hogdev->device, hogdev->attioid);
+
+ close(hogdev->uhid_fd);
+ hogdev->uhid_fd = -1;
+
devices = g_slist_remove(devices, hogdev);
hog_device_free(hogdev);
diff --git a/input/main.c b/input/main.c
index 722bc49..d1623ec 100644
--- a/input/main.c
+++ b/input/main.c
@@ -86,6 +86,7 @@ static void input_exit(void)
BLUETOOTH_PLUGIN_DEFINE(input, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
input_init, input_exit)
+#ifdef HAVE_LINUX_UHID_H
static int hog_init(void)
{
if (!main_opts.gatt_enabled) {
@@ -106,3 +107,4 @@ static void hog_exit(void)
BLUETOOTH_PLUGIN_DEFINE(hog, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
hog_init, hog_exit)
+#endif
diff --git a/input/manager.c b/input/manager.c
index 01f83ce..28f3f81 100644
--- a/input/manager.c
+++ b/input/manager.c
@@ -197,6 +197,7 @@ void input_manager_exit(void)
connection = NULL;
}
+#ifdef HAVE_LINUX_UHID_H
static int hog_device_probe(struct btd_device *device, GSList *uuids)
{
const char *path = device_get_path(device);
@@ -231,3 +232,4 @@ void hog_manager_exit(void)
{
btd_unregister_device_driver(&hog_driver);
}
+#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 11/21] hog: Use real values for vendor and product IDs
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (9 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 10/21] hog: HID I/O driver João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 12/21] gatt: add Report Reference descriptor UUID João Paulo Rechi Vita
` (10 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Claudio Takahasi
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
This patch replaces the hard-code values for vendor and product IDs
by the values obtained from the device core functions. Vendor and
product IDs are read from the remote's Device Information Service.
---
input/hog_device.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 5dd9cf1..547bd6c 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -176,6 +176,7 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
struct hog_device *hogdev = user_data;
uint8_t value[HOG_REPORT_MAP_MAX_SIZE];
struct uhid_event ev;
+ uint16_t vendor_src, vendor, product, version;
ssize_t vlen;
int i;
@@ -198,15 +199,21 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
DBG("\t %02x %02x", value[i], value[i + 1]);
}
+ vendor_src = btd_device_get_vendor_src(hogdev->device);
+ vendor = btd_device_get_vendor(hogdev->device);
+ product = btd_device_get_product(hogdev->device);
+ version = btd_device_get_version(hogdev->device);
+ DBG("DIS information: vendor_src=0x%X, vendor=0x%X, product=0x%X, "
+ "version=0x%X", vendor_src, vendor, product, version);
+
/* create uHID device */
memset(&ev, 0, sizeof(ev));
ev.type = UHID_CREATE;
- /* TODO: get info from DIS */
strcpy((char *)ev.u.create.name, "bluez-hog-device");
- ev.u.create.vendor = 0xBEBA;
- ev.u.create.product = 0xCAFE;
- ev.u.create.version = 0;
- ev.u.create.country = 0;
+ ev.u.create.vendor = vendor;
+ ev.u.create.product = product;
+ ev.u.create.version = version;
+ ev.u.create.country = 0; /* get this info from the right place */
ev.u.create.bus = BUS_BLUETOOTH;
ev.u.create.rd_data = value;
ev.u.create.rd_size = vlen;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 12/21] gatt: add Report Reference descriptor UUID
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (10 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 11/21] hog: Use real values for vendor and product IDs João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 13/21] hog: Add read Report Reference descriptor João Paulo Rechi Vita
` (9 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Claudio Takahasi
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
---
attrib/gatt.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/attrib/gatt.h b/attrib/gatt.h
index 9ffe58f..c7e79ab 100644
--- a/attrib/gatt.h
+++ b/attrib/gatt.h
@@ -46,6 +46,7 @@
#define GATT_CHARAC_FMT_UUID 0x2904
#define GATT_CHARAC_AGREG_FMT_UUID 0x2905
#define GATT_CHARAC_VALID_RANGE_UUID 0x2906
+#define GATT_REPORT_REFERENCE 0x2908
/* Client Characteristic Configuration bit field */
#define GATT_CLIENT_CHARAC_CFG_NOTIF_BIT 0x0001
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 13/21] hog: Add read Report Reference descriptor
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (11 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 12/21] gatt: add Report Reference descriptor UUID João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 14/21] hog: Prepend Report ID to the HID report João Paulo Rechi Vita
` (8 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Claudio Takahasi
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
This patch adds the GATT operation to read the value of the Report
Reference descriptor of the Report characteristic.
---
input/hog_device.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 547bd6c..823d7a4 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -118,9 +118,27 @@ static void write_ccc(uint16_t handle, gpointer user_data)
report_ccc_written_cb, hogdev);
}
+static void report_reference_cb(guint8 status, const guint8 *pdu,
+ guint16 plen, gpointer user_data)
+{
+ if (status != 0) {
+ error("Read Report Reference descriptor failed: %s",
+ att_ecode2str(status));
+ return;
+ }
+
+ if (plen != 3) {
+ error("Malformed ATT read response");
+ return;
+ }
+
+ DBG("Report ID: 0x%02x Report type: 0x%02x", pdu[1], pdu[2]);
+}
+
static void discover_descriptor_cb(guint8 status, const guint8 *pdu,
guint16 len, gpointer user_data)
{
+ struct hog_device *hogdev = user_data;
struct att_data_list *list;
uint8_t format;
int i;
@@ -146,10 +164,11 @@ static void discover_descriptor_cb(guint8 status, const guint8 *pdu,
handle = att_get_u16(value);
uuid16 = att_get_u16(&value[2]);
- if (uuid16 != GATT_CLIENT_CHARAC_CFG_UUID)
- continue;
-
- write_ccc(handle, user_data);
+ if (uuid16 == GATT_CLIENT_CHARAC_CFG_UUID)
+ write_ccc(handle, user_data);
+ else if (uuid16 == GATT_REPORT_REFERENCE)
+ gatt_read_char(hogdev->attrib, handle, 0,
+ report_reference_cb, hogdev);
}
done:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 14/21] hog: Prepend Report ID to the HID report
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (12 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 13/21] hog: Add read Report Reference descriptor João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 15/21] hog: Add support for uHID events João Paulo Rechi Vita
` (7 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
If the report descriptor has a Report ID tag it has to be prepended
to the report data to construct the HID report itself.
---
input/hog_device.c | 78 ++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 64 insertions(+), 14 deletions(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 823d7a4..53b4746 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -57,10 +57,6 @@
#define HOG_REPORT_MAP_MAX_SIZE 512
-struct report {
- struct gatt_char *decl;
-};
-
struct hog_device {
char *path;
struct btd_device *device;
@@ -70,25 +66,64 @@ struct hog_device {
struct gatt_primary *hog_primary;
GSList *reports;
int uhid_fd;
+ gboolean prepend_id;
+};
+
+struct report {
+ uint8_t id;
+ uint8_t type;
+ struct gatt_char *decl;
+ struct hog_device *hogdev;
};
static GSList *devices = NULL;
+static gint report_handle_cmp(gconstpointer a, gconstpointer b)
+{
+ const struct report *report = a;
+ uint16_t handle = GPOINTER_TO_UINT(b);
+
+ return report->decl->value_handle - handle;
+}
+
static void report_value_cb(const uint8_t *pdu, uint16_t len, gpointer user_data)
{
struct hog_device *hogdev = user_data;
struct uhid_event ev;
uint16_t report_size = len - 3;
+ guint handle;
+ GSList *l;
+ struct report *report;
+ uint8_t *buf;
if (len < 3) { /* 1-byte opcode + 2-byte handle */
error("Malformed ATT notification");
return;
}
+ handle = att_get_u16(&pdu[1]);
+
+ l = g_slist_find_custom(hogdev->reports, GUINT_TO_POINTER(handle),
+ report_handle_cmp);
+ if (!l) {
+ error("Invalid report");
+ return;
+ }
+
+ report = l->data;
+
memset(&ev, 0, sizeof(ev));
ev.type = UHID_INPUT;
ev.u.input.size = MIN(report_size, UHID_DATA_MAX);
- memcpy(ev.u.input.data, &pdu[3], MIN(report_size, UHID_DATA_MAX));
+
+ buf = ev.u.input.data;
+ if (hogdev->prepend_id) {
+ *buf = report->id;
+ buf++;
+ ev.u.input.size++;
+ }
+
+ memcpy(buf, &pdu[3], MIN(report_size, UHID_DATA_MAX));
if (write(hogdev->uhid_fd, &ev, sizeof(ev)) < 0)
error("uHID write failed: %s", strerror(errno));
@@ -121,6 +156,8 @@ static void write_ccc(uint16_t handle, gpointer user_data)
static void report_reference_cb(guint8 status, const guint8 *pdu,
guint16 plen, gpointer user_data)
{
+ struct report *report = user_data;
+
if (status != 0) {
error("Read Report Reference descriptor failed: %s",
att_ecode2str(status));
@@ -132,13 +169,16 @@ static void report_reference_cb(guint8 status, const guint8 *pdu,
return;
}
+ report->id = pdu[1];
+ report->type = pdu[2];
DBG("Report ID: 0x%02x Report type: 0x%02x", pdu[1], pdu[2]);
}
static void discover_descriptor_cb(guint8 status, const guint8 *pdu,
guint16 len, gpointer user_data)
{
- struct hog_device *hogdev = user_data;
+ struct report *report = user_data;
+ struct hog_device *hogdev = report->hogdev;
struct att_data_list *list;
uint8_t format;
int i;
@@ -165,10 +205,10 @@ static void discover_descriptor_cb(guint8 status, const guint8 *pdu,
uuid16 = att_get_u16(&value[2]);
if (uuid16 == GATT_CLIENT_CHARAC_CFG_UUID)
- write_ccc(handle, user_data);
+ write_ccc(handle, hogdev);
else if (uuid16 == GATT_REPORT_REFERENCE)
gatt_read_char(hogdev->attrib, handle, 0,
- report_reference_cb, hogdev);
+ report_reference_cb, report);
}
done:
@@ -211,11 +251,20 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
}
DBG("Report MAP:");
- for (i = 0; i < vlen; i += 2) {
- if (i + 1 == vlen)
- DBG("\t %02x", value[i]);
- else
- DBG("\t %02x %02x", value[i], value[i + 1]);
+ for (i = 0; i < vlen; i++) {
+ switch (value[i]) {
+ case 0x85:
+ case 0x86:
+ case 0x87:
+ hogdev->prepend_id = TRUE;
+ }
+
+ if (i % 2 == 0) {
+ if (i + 1 == vlen)
+ DBG("\t %02x", value[i]);
+ else
+ DBG("\t %02x %02x", value[i], value[i + 1]);
+ }
}
vendor_src = btd_device_get_vendor_src(hogdev->device);
@@ -271,10 +320,11 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
if (bt_uuid_cmp(&uuid, &report_uuid) == 0) {
report = g_new0(struct report, 1);
+ report->hogdev = hogdev;
report->decl = g_memdup(chr, sizeof(*chr));
hogdev->reports = g_slist_append(hogdev->reports,
report);
- discover_descriptor(hogdev->attrib, chr, next, hogdev);
+ discover_descriptor(hogdev->attrib, chr, next, report);
} else if (bt_uuid_cmp(&uuid, &report_map_uuid) == 0)
gatt_read_char(hogdev->attrib, chr->value_handle, 0,
report_map_read_cb, hogdev);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 15/21] hog: Add support for uHID events
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (13 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 14/21] hog: Prepend Report ID to the HID report João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 16/21] hog: Handle output reports João Paulo Rechi Vita
` (6 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
This patch adds the GLib GIOChannel watcher to monitor uhid events.
---
input/hog_device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/input/hog_device.c b/input/hog_device.c
index 53b4746..b812ed5 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -53,6 +53,7 @@
#define HOG_REPORT_MAP_UUID 0x2A4B
#define HOG_REPORT_UUID 0x2A4D
+
#define UHID_DEVICE_FILE "/dev/uhid"
#define HOG_REPORT_MAP_MAX_SIZE 512
@@ -67,6 +68,7 @@ struct hog_device {
GSList *reports;
int uhid_fd;
gboolean prepend_id;
+ guint uhid_watch_id;
};
struct report {
@@ -331,6 +333,36 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
}
}
+static gboolean uhid_event_cb(GIOChannel *io, GIOCondition cond,
+ gpointer user_data)
+{
+ struct hog_device *hogdev = user_data;
+ struct uhid_event ev;
+ ssize_t bread;
+ int fd;
+
+ if (cond & (G_IO_ERR | G_IO_NVAL))
+ goto failed;
+
+ fd = g_io_channel_unix_get_fd(io);
+ memset(&ev, 0, sizeof(ev));
+
+ bread = read(fd, &ev, sizeof(ev));
+ if (bread < 0) {
+ int err = -errno;
+ DBG("uhid-dev read: %s(%d)", strerror(err), err);
+ goto failed;
+ }
+
+ DBG("uHID event type %d received", ev.type);
+
+ return TRUE;
+
+failed:
+ hogdev->uhid_watch_id = 0;
+ return FALSE;
+}
+
static void attio_connected_cb(GAttrib *attrib, gpointer user_data)
{
struct hog_device *hogdev = user_data;
@@ -429,6 +461,8 @@ int hog_device_register(struct btd_device *device, const char *path)
{
struct hog_device *hogdev;
struct gatt_primary *prim;
+ GIOCondition cond = G_IO_IN | G_IO_ERR | G_IO_NVAL;
+ GIOChannel *io;
hogdev = find_device_by_path(devices, path);
if (hogdev)
@@ -449,12 +483,19 @@ int hog_device_register(struct btd_device *device, const char *path)
return -errno;
}
+ io = g_io_channel_unix_new(hogdev->uhid_fd);
+ g_io_channel_set_encoding(io, NULL, NULL);
+ hogdev->uhid_watch_id = g_io_add_watch(io, cond, uhid_event_cb,
+ hogdev);
+ g_io_channel_unref(io);
+
hogdev->hog_primary = g_memdup(prim, sizeof(*prim));
hogdev->attioid = btd_device_add_attio_callback(device,
attio_connected_cb,
attio_disconnected_cb,
hogdev);
+
device_set_auto_connect(device, TRUE);
devices = g_slist_append(devices, hogdev);
@@ -472,6 +513,11 @@ int hog_device_unregister(const char *path)
btd_device_remove_attio_callback(hogdev->device, hogdev->attioid);
+ if (hogdev->uhid_watch_id) {
+ g_source_remove(hogdev->uhid_watch_id);
+ hogdev->uhid_watch_id = 0;
+ }
+
close(hogdev->uhid_fd);
hogdev->uhid_fd = -1;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 16/21] hog: Handle output reports
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (14 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 15/21] hog: Add support for uHID events João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 17/21] hog: Handle output events João Paulo Rechi Vita
` (5 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
This patch writes the output reports coming from the HID host on the
device's Output Report characteristic.
---
input/hog_device.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/input/hog_device.c b/input/hog_device.c
index b812ed5..d8d67ae 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -54,6 +54,9 @@
#define HOG_REPORT_MAP_UUID 0x2A4B
#define HOG_REPORT_UUID 0x2A4D
+#define HOG_REPORT_TYPE_INPUT 1
+#define HOG_REPORT_TYPE_OUTPUT 2
+
#define UHID_DEVICE_FILE "/dev/uhid"
#define HOG_REPORT_MAP_MAX_SIZE 512
@@ -333,6 +336,54 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
}
}
+static void output_written_cb(guint8 status, const guint8 *pdu,
+ guint16 plen, gpointer user_data)
+{
+ if (status != 0) {
+ error("Write output report failed: %s", att_ecode2str(status));
+ return;
+ }
+}
+
+static gint report_type_cmp(gconstpointer a, gconstpointer b)
+{
+ const struct report *report = a;
+ uint8_t type = GPOINTER_TO_UINT(b);
+
+ return report->type - type;
+}
+
+static void forward_report(struct hog_device *hogdev,
+ struct uhid_event *ev)
+{
+ struct report *report;
+ GSList *l;
+ void *data;
+ int size;
+ guint type;
+
+ type = HOG_REPORT_TYPE_OUTPUT;
+ data = ev->u.output.data;
+ size = ev->u.output.size;
+
+ l = g_slist_find_custom(hogdev->reports, GUINT_TO_POINTER(type),
+ report_type_cmp);
+ if (!l)
+ return;
+
+ report = l->data;
+
+ DBG("Sending report type %d to device %s handle 0x%X", type,
+ hogdev->path, report->decl->value_handle);
+
+ if (report->decl->properties & ATT_CHAR_PROPER_WRITE)
+ gatt_write_char(hogdev->attrib, report->decl->value_handle,
+ data, size, output_written_cb, hogdev);
+ else if (report->decl->properties & ATT_CHAR_PROPER_WRITE_WITHOUT_RESP)
+ gatt_write_char(hogdev->attrib, report->decl->value_handle,
+ data, size, NULL, NULL);
+}
+
static gboolean uhid_event_cb(GIOChannel *io, GIOCondition cond,
gpointer user_data)
{
@@ -356,6 +407,15 @@ static gboolean uhid_event_cb(GIOChannel *io, GIOCondition cond,
DBG("uHID event type %d received", ev.type);
+ switch (ev.type) {
+ case UHID_OUTPUT:
+ forward_report(hogdev, &ev);
+ break;
+ default:
+ warn("unexpected uHID event");
+ break;
+ }
+
return TRUE;
failed:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 17/21] hog: Handle output events
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (15 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 16/21] hog: Handle output reports João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 18/21] hog: Handle feature reports João Paulo Rechi Vita
` (4 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
This patch prints the output events coming from the HID host for debug
purposes.
---
input/hog_device.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/input/hog_device.c b/input/hog_device.c
index d8d67ae..236745a 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -411,6 +411,11 @@ static gboolean uhid_event_cb(GIOChannel *io, GIOCondition cond,
case UHID_OUTPUT:
forward_report(hogdev, &ev);
break;
+ case UHID_OUTPUT_EV:
+ DBG("uHID output event: type %d code %d value %d",
+ ev.u.output_ev.type, ev.u.output_ev.code,
+ ev.u.output_ev.value);
+ break;
default:
warn("unexpected uHID event");
break;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 18/21] hog: Handle feature reports
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (16 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 17/21] hog: Handle output events João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 19/21] hog: Add HID Information Characteristic read João Paulo Rechi Vita
` (3 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: João Paulo Rechi Vita
This patch writes the feature reports coming from the HID host on the
device's Feature Report characteristic.
---
input/hog_device.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 236745a..00127c3 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -56,6 +56,7 @@
#define HOG_REPORT_TYPE_INPUT 1
#define HOG_REPORT_TYPE_OUTPUT 2
+#define HOG_REPORT_TYPE_FEATURE 3
#define UHID_DEVICE_FILE "/dev/uhid"
@@ -362,10 +363,20 @@ static void forward_report(struct hog_device *hogdev,
int size;
guint type;
- type = HOG_REPORT_TYPE_OUTPUT;
data = ev->u.output.data;
size = ev->u.output.size;
+ switch (ev->type) {
+ case UHID_OUTPUT:
+ type = HOG_REPORT_TYPE_OUTPUT;
+ break;
+ case UHID_FEATURE:
+ type = HOG_REPORT_TYPE_FEATURE;
+ break;
+ default:
+ return;
+ }
+
l = g_slist_find_custom(hogdev->reports, GUINT_TO_POINTER(type),
report_type_cmp);
if (!l)
@@ -409,6 +420,7 @@ static gboolean uhid_event_cb(GIOChannel *io, GIOCondition cond,
switch (ev.type) {
case UHID_OUTPUT:
+ case UHID_FEATURE:
forward_report(hogdev, &ev);
break;
case UHID_OUTPUT_EV:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 19/21] hog: Add HID Information Characteristic read
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (17 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 18/21] hog: Handle feature reports João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 20/21] hog: Use hardware country code João Paulo Rechi Vita
` (2 subsequent siblings)
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Claudio Takahasi
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
This patch adds the characteristic value read for HID Information
Characteristic. It's information contains HID Device's HID Attributes.
---
input/hog_device.c | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 00127c3..778a367 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -51,6 +51,7 @@
#include "attio.h"
#include "gatt.h"
+#define HOG_INFO_UUID 0x2A4A
#define HOG_REPORT_MAP_UUID 0x2A4B
#define HOG_REPORT_UUID 0x2A4D
@@ -61,6 +62,7 @@
#define UHID_DEVICE_FILE "/dev/uhid"
#define HOG_REPORT_MAP_MAX_SIZE 512
+#define HID_INFO_SIZE 4
struct hog_device {
char *path;
@@ -73,6 +75,9 @@ struct hog_device {
int uhid_fd;
gboolean prepend_id;
guint uhid_watch_id;
+ uint16_t bcdhid;
+ uint8_t bcountrycode;
+ uint8_t flags;
};
struct report {
@@ -296,10 +301,37 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
error("Failed to create uHID device: %s", strerror(errno));
}
+static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ gpointer user_data)
+{
+ struct hog_device *hogdev = user_data;
+ uint8_t value[HID_INFO_SIZE];
+ ssize_t vlen;
+
+ if (status != 0) {
+ error("HID Information read failed: %s",
+ att_ecode2str(status));
+ return;
+ }
+
+ vlen = dec_read_resp(pdu, plen, value, sizeof(value));
+ if (vlen != 4) {
+ error("ATT protocol error");
+ return;
+ }
+
+ hogdev->bcdhid = att_get_u16(&value[0]);
+ hogdev->bcountrycode = value[2];
+ hogdev->flags = value[3];
+
+ DBG("bcdHID: 0x%04X bCountryCode: 0x%02X Flags: 0x%02X",
+ hogdev->bcdhid, hogdev->bcountrycode, hogdev->flags);
+}
+
static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
{
struct hog_device *hogdev = user_data;
- bt_uuid_t report_uuid, report_map_uuid;
+ bt_uuid_t report_uuid, report_map_uuid, info_uuid;
struct report *report;
GSList *l;
@@ -311,6 +343,7 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
bt_uuid16_create(&report_uuid, HOG_REPORT_UUID);
bt_uuid16_create(&report_map_uuid, HOG_REPORT_MAP_UUID);
+ bt_uuid16_create(&info_uuid, HOG_INFO_UUID);
for (l = chars; l; l = g_slist_next(l)) {
struct gatt_char *chr, *next;
@@ -334,6 +367,9 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
} else if (bt_uuid_cmp(&uuid, &report_map_uuid) == 0)
gatt_read_char(hogdev->attrib, chr->value_handle, 0,
report_map_read_cb, hogdev);
+ else if (bt_uuid_cmp(&uuid, &info_uuid) == 0)
+ gatt_read_char(hogdev->attrib, chr->value_handle, 0,
+ info_read_cb, hogdev);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 20/21] hog: Use hardware country code
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (18 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 19/21] hog: Add HID Information Characteristic read João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-03 18:43 ` [PATCH 21/21] hog: Handle HID devices operating in Boot Protocol Mode João Paulo Rechi Vita
2012-07-09 14:00 ` [PATCH 00/21] HID over GATT plugin Johan Hedberg
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Claudio Takahasi
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
bCountryCode is a 8-bits integer identifying hardware target country.
The order of the characteristic declarations may be different on each
implementation. Since GATT/ATT requests need to be serialized, HID
information will be returned before report map characteristic value.
---
input/hog_device.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 778a367..7e6c4b1 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -292,7 +292,7 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
ev.u.create.vendor = vendor;
ev.u.create.product = product;
ev.u.create.version = version;
- ev.u.create.country = 0; /* get this info from the right place */
+ ev.u.create.country = hogdev->bcountrycode;
ev.u.create.bus = BUS_BLUETOOTH;
ev.u.create.rd_data = value;
ev.u.create.rd_size = vlen;
@@ -334,6 +334,7 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
bt_uuid_t report_uuid, report_map_uuid, info_uuid;
struct report *report;
GSList *l;
+ uint16_t map_handle = 0, info_handle = 0;
if (status != 0) {
const char *str = att_ecode2str(status);
@@ -365,12 +366,18 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
report);
discover_descriptor(hogdev->attrib, chr, next, report);
} else if (bt_uuid_cmp(&uuid, &report_map_uuid) == 0)
- gatt_read_char(hogdev->attrib, chr->value_handle, 0,
- report_map_read_cb, hogdev);
+ map_handle = chr->value_handle;
else if (bt_uuid_cmp(&uuid, &info_uuid) == 0)
- gatt_read_char(hogdev->attrib, chr->value_handle, 0,
- info_read_cb, hogdev);
+ info_handle = chr->value_handle;
}
+
+ if (info_handle)
+ gatt_read_char(hogdev->attrib, info_handle, 0,
+ info_read_cb, hogdev);
+
+ if (map_handle)
+ gatt_read_char(hogdev->attrib, map_handle, 0,
+ report_map_read_cb, hogdev);
}
static void output_written_cb(guint8 status, const guint8 *pdu,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 21/21] hog: Handle HID devices operating in Boot Protocol Mode
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (19 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 20/21] hog: Use hardware country code João Paulo Rechi Vita
@ 2012-07-03 18:43 ` João Paulo Rechi Vita
2012-07-09 14:00 ` [PATCH 00/21] HID over GATT plugin Johan Hedberg
21 siblings, 0 replies; 27+ messages in thread
From: João Paulo Rechi Vita @ 2012-07-03 18:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Paulo Alcantara
From: Paulo Alcantara <paulo.alcantara@openbossa.org>
BlueZ does not support HID devices operating in Boot Protocol Mode, so we
need to set it back to Report Protocol Mode through the Protocol Mode
characteristic.
This patch takes cares of changing from Boot Protocol Mode to Report
Protocol Mode by writing the Protocol Mode characteristic value to 1,
which is value for Report Protocol Mode on HID devices operating in
Boot Protocol Mode.
---
input/hog_device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 48 insertions(+), 2 deletions(-)
diff --git a/input/hog_device.c b/input/hog_device.c
index 7e6c4b1..18854b8 100644
--- a/input/hog_device.c
+++ b/input/hog_device.c
@@ -54,11 +54,15 @@
#define HOG_INFO_UUID 0x2A4A
#define HOG_REPORT_MAP_UUID 0x2A4B
#define HOG_REPORT_UUID 0x2A4D
+#define HOG_PROTO_MODE_UUID 0x2A4E
#define HOG_REPORT_TYPE_INPUT 1
#define HOG_REPORT_TYPE_OUTPUT 2
#define HOG_REPORT_TYPE_FEATURE 3
+#define HOG_PROTO_MODE_BOOT 0
+#define HOG_PROTO_MODE_REPORT 1
+
#define UHID_DEVICE_FILE "/dev/uhid"
#define HOG_REPORT_MAP_MAX_SIZE 512
@@ -77,6 +81,7 @@ struct hog_device {
guint uhid_watch_id;
uint16_t bcdhid;
uint8_t bcountrycode;
+ uint16_t proto_mode_handle;
uint8_t flags;
};
@@ -328,13 +333,45 @@ static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
hogdev->bcdhid, hogdev->bcountrycode, hogdev->flags);
}
+static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ gpointer user_data)
+{
+ struct hog_device *hogdev = user_data;
+ uint8_t value;
+ ssize_t vlen;
+
+ if (status != 0) {
+ error("Protocol Mode characteristic read failed: %s",
+ att_ecode2str(status));
+ return;
+ }
+
+ vlen = dec_read_resp(pdu, plen, &value, sizeof(value));
+ if (vlen < 0) {
+ error("ATT protocol error");
+ return;
+ }
+
+ if (value == HOG_PROTO_MODE_BOOT) {
+ uint8_t nval = HOG_PROTO_MODE_REPORT;
+
+ DBG("HoG device %s is operating in Boot Procotol Mode",
+ hogdev->path);
+
+ gatt_write_char(hogdev->attrib, hogdev->proto_mode_handle, &nval,
+ sizeof(nval), NULL, NULL);
+ } else if (value == HOG_PROTO_MODE_REPORT)
+ DBG("HoG device %s is operating in Report Protocol Mode",
+ hogdev->path);
+}
+
static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
{
struct hog_device *hogdev = user_data;
- bt_uuid_t report_uuid, report_map_uuid, info_uuid;
+ bt_uuid_t report_uuid, report_map_uuid, info_uuid, proto_mode_uuid;
struct report *report;
GSList *l;
- uint16_t map_handle = 0, info_handle = 0;
+ uint16_t map_handle = 0, info_handle = 0, proto_mode_handle = 0;
if (status != 0) {
const char *str = att_ecode2str(status);
@@ -345,6 +382,7 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
bt_uuid16_create(&report_uuid, HOG_REPORT_UUID);
bt_uuid16_create(&report_map_uuid, HOG_REPORT_MAP_UUID);
bt_uuid16_create(&info_uuid, HOG_INFO_UUID);
+ bt_uuid16_create(&proto_mode_uuid, HOG_PROTO_MODE_UUID);
for (l = chars; l; l = g_slist_next(l)) {
struct gatt_char *chr, *next;
@@ -369,6 +407,14 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
map_handle = chr->value_handle;
else if (bt_uuid_cmp(&uuid, &info_uuid) == 0)
info_handle = chr->value_handle;
+ else if (bt_uuid_cmp(&uuid, &proto_mode_uuid) == 0)
+ proto_mode_handle = chr->value_handle;
+ }
+
+ if (proto_mode_handle) {
+ hogdev->proto_mode_handle = proto_mode_handle;
+ gatt_read_char(hogdev->attrib, proto_mode_handle, 0,
+ proto_mode_read_cb, hogdev);
}
if (info_handle)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH 00/21] HID over GATT plugin
2012-07-03 18:42 [PATCH 00/21] HID over GATT plugin João Paulo Rechi Vita
` (20 preceding siblings ...)
2012-07-03 18:43 ` [PATCH 21/21] hog: Handle HID devices operating in Boot Protocol Mode João Paulo Rechi Vita
@ 2012-07-09 14:00 ` Johan Hedberg
2012-07-09 22:08 ` Pavan Savoy
21 siblings, 1 reply; 27+ messages in thread
From: Johan Hedberg @ 2012-07-09 14:00 UTC (permalink / raw)
To: João Paulo Rechi Vita; +Cc: linux-bluetooth
Hi João Paulo,
On Tue, Jul 03, 2012, João Paulo Rechi Vita wrote:
> This is the plugin to support HID over GATT. It has the uHID module as a
> dependency, which is now integrated on the HID maintainer's tree [1] and will
> be part of the HID's 3.6 pull request. Right now a merge of the 'uhid' branch
> of this tree witht the master branch of bluetooth-next is necessary to test
> this plugin, with the uhid module compiled and loaded.
>
> [1] git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
>
> Known limitations:
>
> - No characteristics / descriptors handle storage, we discover everything on
> every re-connection;
>
> - Discovery doesn't work when there is a bonded non-connected HoG device. We're
> working to improve LE connection and discovery management in general, so this
> will be addressed soon.
>
> Claudio Takahasi (8):
> hog: Register HID over GATT device driver
> hog: Add checking for 'EnableGatt'
> hog: Discover descriptors for all characteristics
> hog: Use real values for vendor and product IDs
> gatt: add Report Reference descriptor UUID
> hog: Add read Report Reference descriptor
> hog: Add HID Information Characteristic read
> hog: Use hardware country code
>
> João Paulo Rechi Vita (12):
> hog: Register ATTIO callbacks
> hog: Load primary service handle
> hog: Discover all characteristics declaration
> hog: Discover the "Report Map" characteristic
> hog: Enable "Report" characteristic notifications
> hog: Add report notification handler
> hog: HID I/O driver
> hog: Prepend Report ID to the HID report
> hog: Add support for uHID events
> hog: Handle output reports
> hog: Handle output events
> hog: Handle feature reports
>
> Paulo Alcantara (1):
> hog: Handle HID devices operating in Boot Protocol Mode
>
> Makefile.am | 5 +
> acinclude.m4 | 8 +
> attrib/gatt.h | 1 +
> configure.ac | 2 +
> input/hog_device.c | 694 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> input/hog_device.h | 28 +++
> input/main.c | 24 ++
> input/manager.c | 38 +++
> input/manager.h | 3 +
> 9 files changed, 803 insertions(+)
> create mode 100644 input/hog_device.c
> create mode 100644 input/hog_device.h
Patches 1-9 and 12 have been applied. The rest will need to wait a bit
until I can compile test them on a system with the kernel side support.
Johan
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH 00/21] HID over GATT plugin
2012-07-09 14:00 ` [PATCH 00/21] HID over GATT plugin Johan Hedberg
@ 2012-07-09 22:08 ` Pavan Savoy
2012-07-10 5:57 ` David Herrmann
0 siblings, 1 reply; 27+ messages in thread
From: Pavan Savoy @ 2012-07-09 22:08 UTC (permalink / raw)
To: João Paulo Rechi Vita, linux-bluetooth
Johan, Joao,
Why wasn't uinput sub-system used ?
May be there was a discussion regarding this on list & I missed it ?
why invent uHID ? or the project previously existed ?
On Mon, Jul 9, 2012 at 9:00 AM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
> Hi João Paulo,
>
> On Tue, Jul 03, 2012, João Paulo Rechi Vita wrote:
>> This is the plugin to support HID over GATT. It has the uHID module as a
>> dependency, which is now integrated on the HID maintainer's tree [1] and will
>> be part of the HID's 3.6 pull request. Right now a merge of the 'uhid' branch
>> of this tree witht the master branch of bluetooth-next is necessary to test
>> this plugin, with the uhid module compiled and loaded.
>>
>> [1] git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
>>
>> Known limitations:
>>
>> - No characteristics / descriptors handle storage, we discover everything on
>> every re-connection;
>>
>> - Discovery doesn't work when there is a bonded non-connected HoG device. We're
>> working to improve LE connection and discovery management in general, so this
>> will be addressed soon.
>>
>> Claudio Takahasi (8):
>> hog: Register HID over GATT device driver
>> hog: Add checking for 'EnableGatt'
>> hog: Discover descriptors for all characteristics
>> hog: Use real values for vendor and product IDs
>> gatt: add Report Reference descriptor UUID
>> hog: Add read Report Reference descriptor
>> hog: Add HID Information Characteristic read
>> hog: Use hardware country code
>>
>> João Paulo Rechi Vita (12):
>> hog: Register ATTIO callbacks
>> hog: Load primary service handle
>> hog: Discover all characteristics declaration
>> hog: Discover the "Report Map" characteristic
>> hog: Enable "Report" characteristic notifications
>> hog: Add report notification handler
>> hog: HID I/O driver
>> hog: Prepend Report ID to the HID report
>> hog: Add support for uHID events
>> hog: Handle output reports
>> hog: Handle output events
>> hog: Handle feature reports
>>
>> Paulo Alcantara (1):
>> hog: Handle HID devices operating in Boot Protocol Mode
>>
>> Makefile.am | 5 +
>> acinclude.m4 | 8 +
>> attrib/gatt.h | 1 +
>> configure.ac | 2 +
>> input/hog_device.c | 694 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>> input/hog_device.h | 28 +++
>> input/main.c | 24 ++
>> input/manager.c | 38 +++
>> input/manager.h | 3 +
>> 9 files changed, 803 insertions(+)
>> create mode 100644 input/hog_device.c
>> create mode 100644 input/hog_device.h
>
> Patches 1-9 and 12 have been applied. The rest will need to wait a bit
> until I can compile test them on a system with the kernel side support.
>
> Johan
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 00/21] HID over GATT plugin
2012-07-09 22:08 ` Pavan Savoy
@ 2012-07-10 5:57 ` David Herrmann
2012-07-12 1:49 ` Pavan Savoy
0 siblings, 1 reply; 27+ messages in thread
From: David Herrmann @ 2012-07-10 5:57 UTC (permalink / raw)
To: Pavan Savoy; +Cc: João Paulo Rechi Vita, linux-bluetooth
Hi Pavan
On Tue, Jul 10, 2012 at 12:08 AM, Pavan Savoy <pavan_savoy@sify.com> wrote:
> Johan, Joao,
>
> Why wasn't uinput sub-system used ?
> May be there was a discussion regarding this on list & I missed it ?
Yes, there was a discussion on linux-bluetooth and linux-input. If we
use uinput then we need a user-space HID parser. That would mean
duplicating a lot of kernel HID code.
> why invent uHID ? or the project previously existed ?
What project do you mean here? I don't know any predecessor of uHID.
Btw. uhid is already in Jiri's tree and scheduled for 3.6.
Regards
David
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 00/21] HID over GATT plugin
2012-07-10 5:57 ` David Herrmann
@ 2012-07-12 1:49 ` Pavan Savoy
2012-07-12 5:01 ` David Herrmann
0 siblings, 1 reply; 27+ messages in thread
From: Pavan Savoy @ 2012-07-12 1:49 UTC (permalink / raw)
To: David Herrmann; +Cc: João Paulo Rechi Vita, linux-bluetooth
On Tue, Jul 10, 2012 at 12:57 AM, David Herrmann
<dh.herrmann@googlemail.com> wrote:
> Hi Pavan
>
> On Tue, Jul 10, 2012 at 12:08 AM, Pavan Savoy <pavan_savoy@sify.com> wrote:
>> Johan, Joao,
>>
>> Why wasn't uinput sub-system used ?
>> May be there was a discussion regarding this on list & I missed it ?
>
> Yes, there was a discussion on linux-bluetooth and linux-input. If we
> use uinput then we need a user-space HID parser. That would mean
> duplicating a lot of kernel HID code.
>
>> why invent uHID ? or the project previously existed ?
>
> What project do you mean here? I don't know any predecessor of uHID.
> Btw. uhid is already in Jiri's tree and scheduled for 3.6.
Thanks David, I've realized that now..
No, I was just wondering if uHID was done for hoG only ?
> Regards
> David
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 00/21] HID over GATT plugin
2012-07-12 1:49 ` Pavan Savoy
@ 2012-07-12 5:01 ` David Herrmann
0 siblings, 0 replies; 27+ messages in thread
From: David Herrmann @ 2012-07-12 5:01 UTC (permalink / raw)
To: Pavan Savoy; +Cc: João Paulo Rechi Vita, linux-bluetooth
Hi Pavan
On Thu, Jul 12, 2012 at 3:49 AM, Pavan Savoy <pavan_savoy@sify.com> wrote:
> On Tue, Jul 10, 2012 at 12:57 AM, David Herrmann
> <dh.herrmann@googlemail.com> wrote:
>> Hi Pavan
>>
>> On Tue, Jul 10, 2012 at 12:08 AM, Pavan Savoy <pavan_savoy@sify.com> wrote:
>>> Johan, Joao,
>>>
>>> Why wasn't uinput sub-system used ?
>>> May be there was a discussion regarding this on list & I missed it ?
>>
>> Yes, there was a discussion on linux-bluetooth and linux-input. If we
>> use uinput then we need a user-space HID parser. That would mean
>> duplicating a lot of kernel HID code.
>>
>>> why invent uHID ? or the project previously existed ?
>>
>> What project do you mean here? I don't know any predecessor of uHID.
>> Btw. uhid is already in Jiri's tree and scheduled for 3.6.
>
> Thanks David, I've realized that now..
> No, I was just wondering if uHID was done for hoG only ?
Yes, but it is not limited to HoG. Furthermore, we also planned on
moving HIDP to user-space (using uHID), too.
Regards
David
^ permalink raw reply [flat|nested] 27+ messages in thread