From 05b83d51021afdbec1442341ebcd7e91ccddab88 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Tue, 4 Apr 2023 00:42:39 +0100 Subject: [PATCH] d/wmr: Move wmr_headset_type to wmr_common.h --- src/xrt/drivers/wmr/wmr_common.h | 17 +++++++++++++++++ src/xrt/drivers/wmr/wmr_hmd.h | 13 ++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/xrt/drivers/wmr/wmr_common.h b/src/xrt/drivers/wmr/wmr_common.h index bd3f63520..b01e73671 100644 --- a/src/xrt/drivers/wmr/wmr_common.h +++ b/src/xrt/drivers/wmr/wmr_common.h @@ -20,6 +20,23 @@ extern "C" { #endif +/*! + * Headset type, used to select different control and init/shutdown procedures. + * + * @ingroup drv_wmr + */ +enum wmr_headset_type +{ + WMR_HEADSET_GENERIC, + WMR_HEADSET_HP_VR1000, + WMR_HEADSET_REVERB_G1, + WMR_HEADSET_REVERB_G2, + WMR_HEADSET_SAMSUNG_XE700X3AI, + WMR_HEADSET_SAMSUNG_800ZAA, + WMR_HEADSET_LENOVO_EXPLORER, + WMR_HEADSET_MEDION_ERAZER_X1000, +}; + /*! * Defines for the WMR driver. * diff --git a/src/xrt/drivers/wmr/wmr_hmd.h b/src/xrt/drivers/wmr/wmr_hmd.h index 9a2df140a..ac93daec2 100644 --- a/src/xrt/drivers/wmr/wmr_hmd.h +++ b/src/xrt/drivers/wmr/wmr_hmd.h @@ -27,22 +27,13 @@ #include "wmr_protocol.h" #include "wmr_config.h" #include "wmr_camera.h" +#include "wmr_common.h" + #ifdef __cplusplus extern "C" { #endif -enum wmr_headset_type -{ - WMR_HEADSET_GENERIC, - WMR_HEADSET_HP_VR1000, - WMR_HEADSET_REVERB_G1, - WMR_HEADSET_REVERB_G2, - WMR_HEADSET_SAMSUNG_XE700X3AI, - WMR_HEADSET_SAMSUNG_800ZAA, - WMR_HEADSET_LENOVO_EXPLORER, - WMR_HEADSET_MEDION_ERAZER_X1000, -}; struct wmr_hmd;