mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/prober: Support for querying of 'Product name' from Bluetooth devices.

Browse source
This commit is contained in:
Nima01 2021-10-27 04:08:26 +02:00 committed by Jakob Bornecrantz
parent a081bacc5d
commit 2a1e6debfb
4 changed files with 44 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/xrt/include/xrt/xrt_device.h
View file

@ -11,6 +11,7 @@
#pragma once
#define XRT_DEVICE_NAME_LEN 256
#define XRT_DEVICE_PRODUCT_NAME_LEN 64 // Incl. termination
#include "xrt/xrt_defines.h"

1
src/xrt/include/xrt/xrt_prober.h
View file

@ -131,6 +131,7 @@ struct xrt_prober_device
{
uint16_t vendor_id;
uint16_t product_id;
char product_name[XRT_DEVICE_PRODUCT_NAME_LEN];
enum xrt_bus_type bus;

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

@ -279,8 +279,13 @@ fill_out_product(struct prober *p, struct prober_device *pdev)
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 (strlen(pdev->base.product_name)) {
ret = snprintf(str, ret, "%s device: %s", bus, pdev->base.product_name);
} else {
ret = snprintf(str, ret, "Unknown %s device: %04x:%04x", bus, pdev->base.vendor_id,
pdev->base.product_id);
}
if (ret <= 0) {
return;
}
@ -1107,19 +1112,27 @@ p_get_string_descriptor(struct xrt_prober *xp,
}
}
#endif
if (pdev->base.bus == XRT_BUS_TYPE_BLUETOOTH && which_string == XRT_PROBER_STRING_SERIAL_NUMBER) {
union {
uint8_t arr[8];
uint64_t v;
} u;
u.v = pdev->bluetooth.id;
return snprintf((char *)buffer, max_length, "%02X:%02X:%02X:%02X:%02X:%02X", u.arr[5], u.arr[4],
u.arr[3], u.arr[2], u.arr[1], u.arr[0]);
if (pdev && pdev->base.bus == XRT_BUS_TYPE_BLUETOOTH) {
switch (which_string) {
case XRT_PROBER_STRING_SERIAL_NUMBER: {
union {
uint8_t arr[8];
uint64_t v;
} u;
u.v = pdev->bluetooth.id;
ret = snprintf((char *)buffer, max_length, "%02X:%02X:%02X:%02X:%02X:%02X", u.arr[5], u.arr[4],
u.arr[3], u.arr[2], u.arr[1], u.arr[0]);
}; break;
case XRT_PROBER_STRING_PRODUCT:
ret = snprintf((char *)buffer, max_length, "%s", pdev->base.product_name);
break;
default: ret = 0; break;
}
}
//! @todo add more backends
//! @todo make this unicode (utf-16)? utf-8 would be better...
return 0;
return ret;
}
static bool

25
src/xrt/state_trackers/prober/p_udev.c
View file

@ -55,7 +55,7 @@ static void
p_udev_enumerate_hidraw(struct prober *p, struct udev *udev);
static void
p_udev_add_hidraw(struct prober_device *pdev, uint32_t interface, const char *path);
p_udev_add_hidraw(struct prober_device *pdev, uint32_t interface, const char *path, const char *product_name);
static int
p_udev_get_interface_number(struct udev_device *raw_dev, uint16_t *interface_number);
@ -65,6 +65,7 @@ p_udev_get_and_parse_uevent(struct udev_device *raw_dev,
uint32_t *out_bus_type,
uint16_t *out_vendor_id,
uint16_t *out_product_id,
char (*out_product_name)[XRT_DEVICE_PRODUCT_NAME_LEN],
uint64_t *out_bluetooth_serial);
static int
@ -388,6 +389,7 @@ p_udev_enumerate_hidraw(struct prober *p, struct udev *udev)
uint16_t usb_addr = 0;
uint32_t bus_type = 0;
uint64_t bluetooth_id = 0;
char product_name[XRT_DEVICE_PRODUCT_NAME_LEN] = {0};
const char *sysfs_path;
const char *dev_path;
int ret;
@ -400,7 +402,8 @@ p_udev_enumerate_hidraw(struct prober *p, struct udev *udev)
dev_path = udev_device_get_devnode(raw_dev);
// Bus type, vendor_id and product_id.
ret = p_udev_get_and_parse_uevent(raw_dev, &bus_type, &vendor_id, &product_id, &bluetooth_id);
ret = p_udev_get_and_parse_uevent(raw_dev, &bus_type, &vendor_id, &product_id, &product_name,
&bluetooth_id);
if (ret != 0) {
P_ERROR(p, "Failed to get uevent info from device");
goto next;
@ -451,12 +454,13 @@ p_udev_enumerate_hidraw(struct prober *p, struct udev *udev)
"\t\tbus_type: %i\n"
"\t\tvendor_id: %04x\n"
"\t\tproduct_id: %04x\n"
"\t\tproduct_name: '%s'\n"
"\t\tinterface: %i\n"
"\t\tusb_bus: %i\n"
"\t\tusb_addr: %i\n"
"\t\tbluetooth_id: %012" PRIx64,
(void *)pdev, ret, sysfs_path, dev_path, bus_type, vendor_id, product_id, interface, usb_bus,
usb_addr, bluetooth_id);
(void *)pdev, ret, sysfs_path, dev_path, bus_type, vendor_id, product_id, product_name,
interface, usb_bus, usb_addr, bluetooth_id);
if (ret != 0) {
P_ERROR(p, "p_dev_get_usb_device failed!");
@ -464,7 +468,7 @@ p_udev_enumerate_hidraw(struct prober *p, struct udev *udev)
}
// Add this interface to the usb device.
p_udev_add_hidraw(pdev, interface, dev_path);
p_udev_add_hidraw(pdev, interface, dev_path, product_name);
next:
udev_device_unref(raw_dev);
@ -474,7 +478,7 @@ p_udev_enumerate_hidraw(struct prober *p, struct udev *udev)
}
static void
p_udev_add_hidraw(struct prober_device *pdev, uint32_t interface, const char *path)
p_udev_add_hidraw(struct prober_device *pdev, uint32_t interface, const char *path, const char *product_name)
{
U_ARRAY_REALLOC_OR_FREE(pdev->hidraws, struct prober_hidraw, (pdev->num_hidraws + 1));
@ -483,6 +487,7 @@ p_udev_add_hidraw(struct prober_device *pdev, uint32_t interface, const char *pa
hidraw->interface = interface;
hidraw->path = strdup(path);
strncpy(pdev->base.product_name, product_name, 64);
}
static int
@ -538,12 +543,14 @@ p_udev_get_and_parse_uevent(struct udev_device *raw_dev,
uint32_t *out_bus_type,
uint16_t *out_vendor_id,
uint16_t *out_product_id,
char (*out_product_name)[XRT_DEVICE_PRODUCT_NAME_LEN],
uint64_t *out_bluetooth_serial)
{
struct udev_device *hid_dev;
char *serial_utf8 = NULL;
uint64_t bluetooth_serial = 0;
uint16_t vendor_id = 0, product_id = 0;
char product_name[sizeof(*out_product_name)];
uint32_t bus_type;
const char *uevent;
char *saveptr;
@ -576,7 +583,10 @@ p_udev_get_and_parse_uevent(struct udev_device *raw_dev,
ok = true;
}
} else if (strncmp(line, "HID_NAME=", 9) == 0) {
// U_LOG_D("\t\tprocuct_name: '%s'", line + 9);
product_name[0] = '\0';
strncat(product_name, line + 9, sizeof(product_name));
// U_LOG_D("\t\tprocuct_name: '%s'", *out_product_name);
} else if (strncmp(line, "HID_UNIQ=", 9) == 0) {
serial_utf8 = &line[9];
// U_LOG_D("\t\tserial: '%s'", line + 9);
@ -604,6 +614,7 @@ p_udev_get_and_parse_uevent(struct udev_device *raw_dev,
*out_bus_type = bus_type;
*out_vendor_id = vendor_id;
*out_product_id = product_id;
strncpy(*out_product_name, product_name, sizeof(*out_product_name));
*out_bluetooth_serial = bluetooth_serial;
return 0;
}