mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/prober: Remove remote code in legacy path

Browse source 
Implemented by a builder instead
This commit is contained in:
Jakob Bornecrantz 2022-05-28 12:10:02 +01:00
parent 3c1576fc44
commit 64694a7e56
2 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xrt/state_trackers/prober/CMakeLists.txt
View file

@ -47,10 +47,6 @@ if(XRT_HAVE_V4L2)
target_link_libraries(st_prober PRIVATE drv_v4l2)
endif()
if(XRT_BUILD_DRIVER_REMOTE)
target_link_libraries(st_prober PRIVATE drv_remote)
endif()
if(XRT_BUILD_DRIVER_VF)
target_link_libraries(st_prober PRIVATE drv_vf)
endif()

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

@ -36,10 +36,6 @@
#include "realsense/rs_interface.h"
#endif
#ifdef XRT_BUILD_DRIVER_REMOTE
#include "remote/r_interface.h"
#endif
#include <stdio.h>
#include <string.h>
#include <assert.h>
@ -758,24 +754,6 @@ add_from_auto_probers(struct prober *p, struct xrt_device **xdevs, size_t xdev_c
}
}
static void
add_from_remote(struct prober *p, struct xrt_device **xdevs, size_t xdev_count, bool *have_hmd)
{
if (xdev_count < 3) {
return;
}
#ifdef XRT_BUILD_DRIVER_REMOTE
int port = 4242;
if (!u_config_json_get_remote_port(&p->json, &port)) {
port = 4242;
}
r_create_devices(port, &xdevs[0], &xdevs[1], &xdevs[2]);
*have_hmd = xdevs[0] != NULL;
#endif
}
static void
apply_tracking_override(struct prober *p, struct xrt_device **xdevs, size_t xdev_count, struct xrt_tracking_override *o)
{
@ -1087,7 +1065,7 @@ p_select_device(struct xrt_prober *xp, struct xrt_device **xdevs, size_t xdev_co
add_from_devices(p, xdevs, xdev_count, &have_hmd);
add_from_auto_probers(p, xdevs, xdev_count, &have_hmd);
break;
case U_ACTIVE_CONFIG_REMOTE: add_from_remote(p, xdevs, xdev_count, &have_hmd); break;
case U_ACTIVE_CONFIG_REMOTE: assert(false); // Should never get here.
default: assert(false);
}