From 3060690cbe588ecbc5760d2a4f6b9f18e4bfd291 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Wed, 15 Nov 2023 15:32:45 +0000 Subject: [PATCH] d/ohmd: Tidy includes [NFC] --- src/xrt/drivers/ohmd/oh_device.c | 23 ++++++++++++----------- src/xrt/drivers/ohmd/oh_device.h | 7 +++++-- src/xrt/drivers/ohmd/oh_prober.c | 9 +++++---- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/xrt/drivers/ohmd/oh_device.c b/src/xrt/drivers/ohmd/oh_device.c index ea3fe9e90..f226e2af1 100644 --- a/src/xrt/drivers/ohmd/oh_device.c +++ b/src/xrt/drivers/ohmd/oh_device.c @@ -1,4 +1,4 @@ -// Copyright 2019, Collabora, Ltd. +// Copyright 2019-2023, Collabora, Ltd. // SPDX-License-Identifier: BSL-1.0 /*! * @file @@ -7,23 +7,16 @@ * @ingroup drv_ohmd */ - -#include "math/m_mathinclude.h" #include "xrt/xrt_config_os.h" +#include "xrt/xrt_device.h" #include "xrt/xrt_prober.h" -#include -#include -#include -#include - #include "os/os_time.h" -#include "openhmd.h" - +#include "math/m_mathinclude.h" #include "math/m_api.h" #include "math/m_vec2.h" -#include "xrt/xrt_device.h" + #include "util/u_var.h" #include "util/u_misc.h" #include "util/u_debug.h" @@ -34,6 +27,14 @@ #include "oh_device.h" +#include "openhmd.h" + +#include +#include +#include +#include + + // Should we permit finite differencing to compute angular velocities when not // directly retrieved? DEBUG_GET_ONCE_BOOL_OPTION(ohmd_finite_diff, "OHMD_ALLOW_FINITE_DIFF", true) diff --git a/src/xrt/drivers/ohmd/oh_device.h b/src/xrt/drivers/ohmd/oh_device.h index 08d2ad300..054c1f450 100644 --- a/src/xrt/drivers/ohmd/oh_device.h +++ b/src/xrt/drivers/ohmd/oh_device.h @@ -1,4 +1,4 @@ -// Copyright 2019, Collabora, Ltd. +// Copyright 2019-2023, Collabora, Ltd. // SPDX-License-Identifier: BSL-1.0 /*! * @file @@ -9,8 +9,11 @@ #pragma once -#include "math/m_api.h" #include "xrt/xrt_device.h" +#include "math/m_api.h" + +#include "openhmd.h" + #ifdef __cplusplus extern "C" { diff --git a/src/xrt/drivers/ohmd/oh_prober.c b/src/xrt/drivers/ohmd/oh_prober.c index 5b97fc423..6f13107e5 100644 --- a/src/xrt/drivers/ohmd/oh_prober.c +++ b/src/xrt/drivers/ohmd/oh_prober.c @@ -7,10 +7,6 @@ * @ingroup drv_ohmd */ -#include -#include - -#include "openhmd.h" #include "xrt/xrt_prober.h" #include "util/u_misc.h" @@ -19,6 +15,11 @@ #include "oh_interface.h" #include "oh_device.h" +#include "openhmd.h" + +#include +#include + /*! * @implements xrt_auto_prober