The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

d/vive: Use prober helper code

authored by

Jakob Bornecrantz and committed by
Jakob Bornecrantz
a38ea423 b9d88f4e

+16 -11
+16 -11
src/xrt/drivers/vive/vive_prober.c
··· 1 - // Copyright 2019, Collabora, Ltd. 1 + // Copyright 2019-2022, Collabora, Ltd. 2 2 // SPDX-License-Identifier: BSL-1.0 3 3 /*! 4 4 * @file ··· 11 11 12 12 13 13 #include "util/u_debug.h" 14 + #include "util/u_prober.h" 14 15 #include "util/u_trace_marker.h" 15 16 16 17 #include "vive_device.h" ··· 42 43 log_vive_string(struct xrt_prober *xp, struct xrt_prober_device *dev, enum xrt_prober_string type) 43 44 { 44 45 unsigned char s[256] = {0}; 46 + 45 47 int len = xrt_prober_get_string_descriptor(xp, dev, type, s, sizeof(s)); 46 - if (len > 0) 47 - U_LOG_I("%s: %s", xrt_prober_string_to_string(type), s); 48 + if (len > 0) { 49 + U_LOG_I("%s: %s", u_prober_string_to_string(type), s); 50 + } 51 + 48 52 return len; 49 53 } 50 54 51 55 static void 52 56 log_vive_device(enum u_logging_level log_level, struct xrt_prober *xp, struct xrt_prober_device *dev) 53 57 { 54 - if (log_level > U_LOGGING_INFO) 58 + if (log_level > U_LOGGING_INFO) { 55 59 return; 60 + } 56 61 57 62 U_LOG_I("====== vive device ======"); 58 63 U_LOG_I("Vendor: %04x", dev->vendor_id); 59 64 U_LOG_I("Product: %04x", dev->product_id); 60 65 U_LOG_I("Class: %d", dev->usb_dev_class); 61 - U_LOG_I("Bus type: %s", xrt_bus_type_to_string(dev->bus)); 66 + U_LOG_I("Bus type: %s", u_prober_bus_type_to_string(dev->bus)); 62 67 log_vive_string(xp, dev, XRT_PROBER_STRING_MANUFACTURER); 63 68 log_vive_string(xp, dev, XRT_PROBER_STRING_PRODUCT); 64 69 log_vive_string(xp, dev, XRT_PROBER_STRING_SERIAL_NUMBER); ··· 74 79 { 75 80 log_vive_device(log_level, xp, dev); 76 81 77 - if (!xrt_prober_match_string(xp, dev, XRT_PROBER_STRING_MANUFACTURER, VIVE_MANUFACTURER_STRING) || 78 - !xrt_prober_match_string(xp, dev, XRT_PROBER_STRING_PRODUCT, VIVE_PRODUCT_STRING)) { 82 + if (!u_prober_match_string(xp, dev, XRT_PROBER_STRING_MANUFACTURER, VIVE_MANUFACTURER_STRING) || 83 + !u_prober_match_string(xp, dev, XRT_PROBER_STRING_PRODUCT, VIVE_PRODUCT_STRING)) { 79 84 return -1; 80 85 } 81 86 ··· 147 152 148 153 log_vive_device(log_level, xp, dev); 149 154 150 - if (!xrt_prober_match_string(xp, dev, XRT_PROBER_STRING_MANUFACTURER, VIVE_MANUFACTURER_STRING) || 151 - !xrt_prober_match_string(xp, dev, XRT_PROBER_STRING_PRODUCT, VIVE_PRO_PRODUCT_STRING)) { 155 + if (!u_prober_match_string(xp, dev, XRT_PROBER_STRING_MANUFACTURER, VIVE_MANUFACTURER_STRING) || 156 + !u_prober_match_string(xp, dev, XRT_PROBER_STRING_PRODUCT, VIVE_PRO_PRODUCT_STRING)) { 152 157 U_LOG_D("Vive Pro manufacturer string did not match."); 153 158 return -1; 154 159 } ··· 221 226 222 227 log_vive_device(log_level, xp, dev); 223 228 224 - if (!xrt_prober_match_string(xp, dev, XRT_PROBER_STRING_MANUFACTURER, VALVE_INDEX_MANUFACTURER_STRING) || 225 - !xrt_prober_match_string(xp, dev, XRT_PROBER_STRING_PRODUCT, VALVE_INDEX_PRODUCT_STRING)) { 229 + if (!u_prober_match_string(xp, dev, XRT_PROBER_STRING_MANUFACTURER, VALVE_INDEX_MANUFACTURER_STRING) || 230 + !u_prober_match_string(xp, dev, XRT_PROBER_STRING_PRODUCT, VALVE_INDEX_PRODUCT_STRING)) { 226 231 U_LOG_E("Valve Index manufacturer string did not match."); 227 232 return -1; 228 233 }