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

a/util: Fix function signature for u_builder_find_prober_device

Browse source 
Was this ever working?
This commit is contained in:
Moses Turner 2022-05-25 21:41:36 +01:00 committed by Jakob Bornecrantz
parent bbd6475da0
commit 5652ddd718
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/xrt/auxiliary/util/u_builders.c
View file

@ -20,12 +20,15 @@
struct xrt_prober_device * struct xrt_prober_device *
u_builder_find_prober_device(struct xrt_prober_device *const *xpdevs, u_builder_find_prober_device(struct xrt_prober_device *const *xpdevs,
size_t xpdev_count, size_t xpdev_count,
uint16_t vendor_id,
uint16_t product_id, uint16_t product_id,
uint16_t vendor_id) enum xrt_bus_type bus_type)
{ {
for (size_t i = 0; i < xpdev_count; i++) { for (size_t i = 0; i < xpdev_count; i++) {
struct xrt_prober_device *xpdev = xpdevs[i]; struct xrt_prober_device *xpdev = xpdevs[i];
if (xpdev->product_id != product_id || xpdev->vendor_id != vendor_id) { if (xpdev->product_id != product_id || //
xpdev->vendor_id != vendor_id || //
xpdev->bus != bus_type) {
continue; continue;
} }

3
src/xrt/auxiliary/util/u_builders.h
View file

@ -59,8 +59,9 @@ struct u_builder_search_results
struct xrt_prober_device * struct xrt_prober_device *
u_builder_find_prober_device(struct xrt_prober_device *const *xpdevs, u_builder_find_prober_device(struct xrt_prober_device *const *xpdevs,
size_t xpdev_count, size_t xpdev_count,
uint16_t vendor_id,
uint16_t product_id, uint16_t product_id,
uint16_t vendor_id); enum xrt_bus_type bus_type);
/*! /*!
* Find all of the @ref xrt_prober_device that matches any in the given list of * Find all of the @ref xrt_prober_device that matches any in the given list of

6
src/xrt/targets/common/target_builder_rgb_tracking.c
View file

@ -230,7 +230,8 @@ rgb_estimate_system(struct xrt_builder *xb, cJSON *config, struct xrt_prober *xp
*/ */
#ifdef XRT_BUILD_DRIVER_PSVR #ifdef XRT_BUILD_DRIVER_PSVR
struct xrt_prober_device *psvr = u_builder_find_prober_device(xpdevs, xpdev_count, PSVR_VID, PSVR_PID); struct xrt_prober_device *psvr =
u_builder_find_prober_device(xpdevs, xpdev_count, PSVR_VID, PSVR_PID, XRT_BUS_TYPE_USB);
if (psvr != NULL) { if (psvr != NULL) {
estimate->certain.head = true; estimate->certain.head = true;
} }
@ -322,7 +323,8 @@ rgb_open_system(struct xrt_builder *xb, cJSON *config, struct xrt_prober *xp, st
struct xrt_device *psmv_purple = NULL; struct xrt_device *psmv_purple = NULL;
#ifdef XRT_BUILD_DRIVER_PSVR #ifdef XRT_BUILD_DRIVER_PSVR
struct xrt_prober_device *psvr = u_builder_find_prober_device(xpdevs, xpdev_count, PSVR_VID, PSVR_PID); struct xrt_prober_device *psvr =
u_builder_find_prober_device(xpdevs, xpdev_count, PSVR_VID, PSVR_PID, XRT_BUS_TYPE_USB);
if (psvr != NULL) { if (psvr != NULL) {
head = psvr_device_create(build.psvr); head = psvr_device_create(build.psvr);
} }