The open source OpenXR runtime
d/wmr: Use prober helper code
authored by
Jakob Bornecrantz
and committed by
Jakob Bornecrantz
b9d88f4e
ceed09d9
+4
-3
+4
-3
src/xrt/drivers/wmr/wmr_prober.c
+4
-3
src/xrt/drivers/wmr/wmr_prober.c
···
1
1
// Copyright 2020-2021, N Madsen.
2
-
// Copyright 2020-2021, Collabora, Ltd.
2
+
// Copyright 2020-2022, Collabora, Ltd.
3
3
// SPDX-License-Identifier: BSL-1.0
4
4
/*!
5
5
* @file
···
14
14
15
15
#include "util/u_misc.h"
16
16
#include "util/u_debug.h"
17
+
#include "util/u_prober.h"
17
18
#include "util/u_logging.h"
18
19
#include "util/u_trace_marker.h"
19
20
···
172
173
unsigned char buf[256] = {0};
173
174
int result = xrt_prober_get_string_descriptor(xp, dev_holo, XRT_PROBER_STRING_PRODUCT, buf, sizeof(buf));
174
175
175
-
if (!xrt_prober_match_string(xp, dev_holo, XRT_PROBER_STRING_MANUFACTURER, MS_HOLOLENS_MANUFACTURER_STRING) ||
176
-
!xrt_prober_match_string(xp, dev_holo, XRT_PROBER_STRING_PRODUCT, MS_HOLOLENS_PRODUCT_STRING)) {
176
+
if (!u_prober_match_string(xp, dev_holo, XRT_PROBER_STRING_MANUFACTURER, MS_HOLOLENS_MANUFACTURER_STRING) ||
177
+
!u_prober_match_string(xp, dev_holo, XRT_PROBER_STRING_PRODUCT, MS_HOLOLENS_PRODUCT_STRING)) {
177
178
U_LOG_IFL_E(log_level, "HoloLens Sensors manufacturer or product strings did not match");
178
179
return -1;
179
180
}