The report map in the cache could be dirty, for example when reading a
report map from peer was cancelled, we should be able to detect it and
not try to create UHID. Instead we will read it again from the peer.
---
profiles/input/hog-lib.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
index 089f42826..d6a3bda4d 100644
--- a/profiles/input/hog-lib.c
+++ b/profiles/input/hog-lib.c
@@ -946,7 +946,7 @@ static void uhid_create(struct bt_hog *hog, uint8_t *report_map,
struct uhid_event ev;
ssize_t vlen = report_map_len;
char itemstr[20]; /* 5x3 (data) + 4 (continuation) + 1 (null) */
- int i, err;
+ int i, err, collection_depth = 0;
GError *gerr = NULL;
DBG("Report MAP:");
@@ -960,6 +960,14 @@ static void uhid_create(struct bt_hog *hog, uint8_t *report_map,
if (!long_item && (value[i] & 0xfc) == 0x84)
hog->has_report_id = TRUE;
+ // Start Collection
+ if (value[i] == 0xa1)
+ collection_depth++;
+
+ // End Collection
+ if (value[i] == 0xc0)
+ collection_depth--;
+
DBG("\t%s", item2string(itemstr, &value[i], ilen));
i += ilen;
@@ -968,10 +976,15 @@ static void uhid_create(struct bt_hog *hog, uint8_t *report_map,
/* Just print remaining items at once and break */
DBG("\t%s", item2string(itemstr, &value[i], vlen - i));
- break;
+ return;
}
}
+ if (collection_depth != 0) {
+ error("Report Map error: unbalanced collection");
+ return;
+ }
+
/* create uHID device */
memset(&ev, 0, sizeof(ev));
ev.type = UHID_CREATE;
@@ -1365,7 +1378,9 @@ static void foreach_hog_chrc(struct gatt_db_attribute *attr, void *user_data)
* UHID to optimize reconnection.
*/
uhid_create(hog, report_map.value, report_map.length);
- } else {
+ }
+
+ if (!hog->uhid_created) {
read_char(hog, hog->attrib, value_handle,
report_map_read_cb, hog);
}
--
2.29.2
