[PATCH] Set vendor, product and version for all HoG instances

[PATCH] Set vendor, product and version for all HoG instances

[Haakon Drews]

Set the the correct vendor and product ids for all UHID/HoG
devices when they are unknown at HoG creation time.

Before this change, when connecting a BT device with multiple HoG
services for the first time, only the first HoG instance's vendor,
product and version fields would be set by the DIS callback. This meant
that all HoG instances except the first would be left with unset values
and their UHID devices would then be created with '0000:0000' as their
vendor:product ids.

Signed-off-by: Haakon Drews <haadr@negentropy.io>
---
 profiles/input/hog-lib.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
index 8fb0283ca..a544e062c 100644
--- a/profiles/input/hog-lib.c
+++ b/profiles/input/hog-lib.c
@@ -1387,10 +1387,19 @@ static void dis_notify(uint8_t source, uint16_t vendor, uint16_t product,
 					uint16_t version, void *user_data)
 {
 	struct bt_hog *hog = user_data;
+	GSList *l;
 
 	hog->vendor = vendor;
 	hog->product = product;
 	hog->version = version;
+
+	for (l = hog->instances; l; l = l->next) {
+		struct bt_hog *instance = l->data;
+
+		instance->vendor = vendor;
+		instance->product = product;
+		instance->version = version;
+	}
 }
 
 struct bt_hog *bt_hog_new(int fd, const char *name, uint16_t vendor,
-- 
2.26.2

Re: [PATCH] Set vendor, product and version for all HoG instances

[Luiz Augusto von Dentz]

Hi Haakon,

On Sat, May 16, 2020 at 2:15 PM Haakon Drews <haadr@negentropy.io> wrote:
>
> Set the the correct vendor and product ids for all UHID/HoG
> devices when they are unknown at HoG creation time.
>
> Before this change, when connecting a BT device with multiple HoG
> services for the first time, only the first HoG instance's vendor,
> product and version fields would be set by the DIS callback. This meant
> that all HoG instances except the first would be left with unset values
> and their UHID devices would then be created with '0000:0000' as their
> vendor:product ids.
>
> Signed-off-by: Haakon Drews <haadr@negentropy.io>

Ive dropped the line above, we don't use that on userspace.

> ---
>  profiles/input/hog-lib.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
> index 8fb0283ca..a544e062c 100644
> --- a/profiles/input/hog-lib.c
> +++ b/profiles/input/hog-lib.c
> @@ -1387,10 +1387,19 @@ static void dis_notify(uint8_t source, uint16_t vendor, uint16_t product,
>                                         uint16_t version, void *user_data)
>  {
>         struct bt_hog *hog = user_data;
> +       GSList *l;
>
>         hog->vendor = vendor;
>         hog->product = product;
>         hog->version = version;
> +
> +       for (l = hog->instances; l; l = l->next) {
> +               struct bt_hog *instance = l->data;
> +
> +               instance->vendor = vendor;
> +               instance->product = product;
> +               instance->version = version;
> +       }
>  }
>
>  struct bt_hog *bt_hog_new(int fd, const char *name, uint16_t vendor,
> --
> 2.26.2

Applied, thanks.

-- 
Luiz Augusto von Dentz