mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/prober: Make sure the usb-product is always filled out

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-09-02 13:25:59 +01:00
parent c021199b98
commit 798ef43342
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/xrt/state_trackers/prober/p_prober.c
View file

@ -198,6 +198,30 @@ p_dev_get_bluetooth_dev(struct prober* p,
* *
*/ */
static void
fill_out_product(struct prober* p, struct prober_device* pdev)
{
const char* bus =
pdev->base.bus == XRT_BUS_TYPE_BLUETOOTH ? "bluetooth" : "usb";
char* str = NULL;
int ret = 0;
do {
ret = snprintf(str, ret, "Unknown %s device: %04x:%04x", bus,
pdev->base.vendor_id, pdev->base.product_id);
if (ret <= 0) {
return;
}
if (str == NULL) {
str = U_CALLOC_WITH_CAST(char, ret + 1);
} else {
pdev->usb.product = str;
return;
}
} while (true);
}
static void static void
add_device(struct prober* p, struct prober_device** out_dev) add_device(struct prober* p, struct prober_device** out_dev)
{ {
@ -627,6 +651,10 @@ list_video_devices(struct xrt_prober* xp,
continue; continue;
} }
if (pdev->usb.product == NULL) {
fill_out_product(p, pdev);
}
cb(xp, &pdev->base, pdev->usb.product, ptr); cb(xp, &pdev->base, pdev->usb.product, ptr);
} }
@ -656,6 +684,7 @@ get_string_descriptor(struct xrt_prober* xp,
//! @todo make this unicode (utf-16)? utf-8 would be better... //! @todo make this unicode (utf-16)? utf-8 would be better...
return 0; return 0;
} }
static void static void
destroy(struct xrt_prober** xp) destroy(struct xrt_prober** xp)
{ {