Commit 2d6b3c21 authored by Jakob Bornecrantz's avatar Jakob Bornecrantz

openxr: Use meta prober

parent aa4a0eb9
Pipeline #30658 passed with stages
in 1 minute and 31 seconds
......@@ -47,6 +47,7 @@ file(
")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../../auxiliary
${CMAKE_CURRENT_SOURCE_DIR}/../../include
${CMAKE_CURRENT_SOURCE_DIR}/../../drivers
)
......
......@@ -6,97 +6,11 @@
* @author Jakob Bornecrantz <jakob@collabora.com>
*/
#include "xrt/xrt_prober.h"
#include "util/u_meta_prober.h"
#include <stdlib.h>
#ifdef XRT_HAVE_OHMD
#include "ohmd/oh_interface.h"
#endif
#ifdef XRT_HAVE_HDK
#include "hdk/hdk_interface.h"
#endif
typedef struct xrt_prober *(*prober_creator)();
static const prober_creator DRIVERS[] = {
#ifdef XRT_HAVE_HDK
// Returns NULL if none found, so OK to go first.
hdk_create_prober,
#endif
#ifdef XRT_HAVE_OHMD
oh_create_prober,
#endif
};
#define NUM_PROBERS (ARRAY_SIZE(DRIVERS))
/*!
* An xrt_prober that contains other xrt_probers.
*/
struct xrt_meta_prober
{
struct xrt_prober base;
struct xrt_prober *probers[NUM_PROBERS];
};
static inline struct xrt_meta_prober *
xrt_meta_prober(struct xrt_prober *p)
{
return (struct xrt_meta_prober *)p;
}
static void
xrt_meta_prober_destroy(struct xrt_prober *p)
{
struct xrt_meta_prober *mp = xrt_meta_prober(p);
for (size_t i = 0; i < NUM_PROBERS; i++) {
if (mp->probers[i]) {
mp->probers[i]->destroy(mp->probers[i]);
mp->probers[i] = NULL;
}
}
free(p);
}
static struct xrt_device *
xrt_meta_prober_autoprobe(struct xrt_prober *p)
{
struct xrt_meta_prober *mp = xrt_meta_prober(p);
for (size_t i = 0; i < NUM_PROBERS; i++) {
if (mp->probers[i]) {
struct xrt_device *ret =
mp->probers[i]->lelo_dallas_autoprobe(
mp->probers[i]);
if (ret) {
return ret;
}
}
}
/* Couldn't find any prober that works. */
return NULL;
}
struct xrt_prober *
struct xrt_prober*
xrt_create_prober()
{
struct xrt_meta_prober *p =
(struct xrt_meta_prober *)calloc(1, sizeof(struct xrt_meta_prober));
for (size_t i = 0; i < NUM_PROBERS; i++) {
p->probers[i] = DRIVERS[i]();
}
p->base.lelo_dallas_autoprobe = xrt_meta_prober_autoprobe;
p->base.destroy = xrt_meta_prober_destroy;
return &p->base;
return u_meta_prober_create();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment