From: Luiz Augusto von Dentz <[email protected]>
This adds support for bt_uhid_replay which enablind replaying
GET/SET_REPORT messages stored during the first time a device is
created.
---
src/shared/uhid.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++
src/shared/uhid.h | 1 +
2 files changed, 126 insertions(+)
diff --git a/src/shared/uhid.c b/src/shared/uhid.c
index 46edb3bfa3ba..1d04dc5a780c 100644
--- a/src/shared/uhid.c
+++ b/src/shared/uhid.c
@@ -30,6 +30,14 @@
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#endif
+struct uhid_replay {
+ bool active;
+ struct queue *out;
+ struct queue *in;
+ struct queue *rout;
+ struct queue *rin;
+};
+
struct bt_uhid {
int ref_count;
struct io *io;
@@ -38,6 +46,7 @@ struct bt_uhid {
struct queue *input;
bool created;
bool started;
+ struct uhid_replay *replay;
};
struct uhid_notify {
@@ -47,6 +56,18 @@ struct uhid_notify {
void *user_data;
};
+static void uhid_replay_free(struct uhid_replay *replay)
+{
+ if (!replay)
+ return;
+
+ queue_destroy(replay->rin, NULL);
+ queue_destroy(replay->in, free);
+ queue_destroy(replay->rout, NULL);
+ queue_destroy(replay->out, free);
+ free(replay);
+}
+
static void uhid_free(struct bt_uhid *uhid)
{
if (uhid->io)
@@ -58,6 +79,8 @@ static void uhid_free(struct bt_uhid *uhid)
if (uhid->input)
queue_destroy(uhid->input, free);
+ uhid_replay_free(uhid->replay);
+
free(uhid);
}
@@ -73,6 +96,44 @@ static void notify_handler(void *data, void *user_data)
notify->func(ev, notify->user_data);
}
+static struct uhid_replay *uhid_replay_new(void)
+{
+ struct uhid_replay *replay = new0(struct uhid_replay, 1);
+
+ replay->out = queue_new();
+ replay->in = queue_new();
+
+ return replay;
+}
+
+static int bt_uhid_record(struct bt_uhid *uhid, bool input,
+ struct uhid_event *ev)
+{
+ if (!uhid)
+ return -EINVAL;
+
+ if (uhid->replay && uhid->replay->active) {
+ if (input)
+ queue_pop_head(uhid->replay->rin);
+ else
+ queue_pop_head(uhid->replay->rout);
+
+ return bt_uhid_replay(uhid);
+ }
+
+ if (!uhid->replay)
+ uhid->replay = uhid_replay_new();
+
+ if (input)
+ queue_push_tail(uhid->replay->in,
+ util_memdup(ev, sizeof(*ev)));
+ else
+ queue_push_tail(uhid->replay->out,
+ util_memdup(ev, sizeof(*ev)));
+
+ return 0;
+}
+
static bool uhid_read_handler(struct io *io, void *user_data)
{
struct bt_uhid *uhid = user_data;
@@ -93,6 +154,13 @@ static bool uhid_read_handler(struct io *io, void *user_data)
if ((size_t) len < sizeof(ev.type))
return false;
+ switch (ev.type) {
+ case UHID_GET_REPORT:
+ case UHID_SET_REPORT:
+ bt_uhid_record(uhid, false, &ev);
+ break;
+ }
+
queue_foreach(uhid->notify_list, notify_handler, &ev);
return true;
@@ -382,6 +450,9 @@ int bt_uhid_set_report_reply(struct bt_uhid *uhid, uint8_t id, uint8_t status)
rsp->id = id;
rsp->err = status;
+ if (bt_uhid_record(uhid, true, &ev) == -EALREADY)
+ return 0;
+
return bt_uhid_send(uhid, &ev);
}
@@ -412,6 +483,9 @@ int bt_uhid_get_report_reply(struct bt_uhid *uhid, uint8_t id, uint8_t number,
memcpy(&rsp->data[len], data, rsp->size - len);
done:
+ if (bt_uhid_record(uhid, true, &ev) == -EALREADY)
+ return 0;
+
return bt_uhid_send(uhid, &ev);
}
@@ -437,3 +511,54 @@ int bt_uhid_destroy(struct bt_uhid *uhid)
return err;
}
+
+static void queue_append(void *data, void *user_data)
+{
+ queue_push_tail(user_data, data);
+}
+
+static struct queue *queue_dup(struct queue *q)
+{
+ struct queue *dup;
+
+ if (!q || queue_isempty(q))
+ return NULL;
+
+ dup = queue_new();
+
+ queue_foreach(q, queue_append, dup);
+
+ return dup;
+}
+
+int bt_uhid_replay(struct bt_uhid *uhid)
+{
+ struct uhid_event *ev;
+
+ if (!uhid || !uhid->started)
+ return -EINVAL;
+
+ if (!uhid->replay)
+ return 0;
+
+ if (uhid->replay->active)
+ goto resend;
+
+ uhid->replay->active = true;
+ queue_destroy(uhid->replay->rin, NULL);
+ uhid->replay->rin = queue_dup(uhid->replay->in);
+
+ queue_destroy(uhid->replay->rout, NULL);
+ uhid->replay->rout = queue_dup(uhid->replay->out);
+
+resend:
+ ev = queue_pop_head(uhid->replay->rout);
+ if (!ev) {
+ uhid->replay->active = false;
+ return 0;
+ }
+
+ queue_foreach(uhid->notify_list, notify_handler, ev);
+
+ return 0;
+}
diff --git a/src/shared/uhid.h b/src/shared/uhid.h
index d70533882727..4e288cb192aa 100644
--- a/src/shared/uhid.h
+++ b/src/shared/uhid.h
@@ -42,3 +42,4 @@ int bt_uhid_set_report_reply(struct bt_uhid *uhid, uint8_t id, uint8_t status);
int bt_uhid_get_report_reply(struct bt_uhid *uhid, uint8_t id, uint8_t number,
uint8_t status, const void *data, size_t size);
int bt_uhid_destroy(struct bt_uhid *uhid);
+int bt_uhid_replay(struct bt_uhid *uhid);
--
2.44.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=842597
---Test result---
Test Summary:
CheckPatch PASS 1.45 seconds
GitLint PASS 0.97 seconds
BuildEll PASS 24.41 seconds
BluezMake PASS 1687.33 seconds
MakeCheck PASS 13.17 seconds
MakeDistcheck PASS 175.32 seconds
CheckValgrind PASS 245.15 seconds
CheckSmatch PASS 348.43 seconds
bluezmakeextell PASS 119.26 seconds
IncrementalBuild PASS 4739.97 seconds
ScanBuild PASS 1039.68 seconds
---
Regards,
Linux Bluetooth