From e0b2c4ad2e57b8febb26782fe7f314d22f320492 Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
Date: Wed, 16 Dec 2020 17:37:52 +0100
Subject: [PATCH] d/ohmd: Make env variables consistent with driver name.

---
 src/xrt/drivers/ohmd/oh_device.c | 5 +++--
 src/xrt/drivers/ohmd/oh_prober.c | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/xrt/drivers/ohmd/oh_device.c b/src/xrt/drivers/ohmd/oh_device.c
index b7fc423b2..f96a73e7e 100644
--- a/src/xrt/drivers/ohmd/oh_device.c
+++ b/src/xrt/drivers/ohmd/oh_device.c
@@ -37,7 +37,7 @@
 
 // Should we permit finite differencing to compute angular velocities when not
 // directly retrieved?
-DEBUG_GET_ONCE_BOOL_OPTION(oh_finite_diff, "OH_ALLOW_FINITE_DIFF", true)
+DEBUG_GET_ONCE_BOOL_OPTION(ohmd_finite_diff, "OHMD_ALLOW_FINITE_DIFF", true)
 
 // Define this if you have the appropriately hacked-up OpenHMD version.
 #undef OHMD_HAVE_ANG_VEL
@@ -533,7 +533,8 @@ oh_device_create(ohmd_context *ctx,
 	ohd->dev = dev;
 	ohd->print_spew = print_spew;
 	ohd->print_debug = print_debug;
-	ohd->enable_finite_difference = debug_get_bool_option_oh_finite_diff();
+	ohd->enable_finite_difference =
+	    debug_get_bool_option_ohmd_finite_diff();
 
 	snprintf(ohd->base.str, XRT_DEVICE_NAME_LEN, "%s (OpenHMD)", prod);
 
diff --git a/src/xrt/drivers/ohmd/oh_prober.c b/src/xrt/drivers/ohmd/oh_prober.c
index db6a5beab..655c9b1f2 100644
--- a/src/xrt/drivers/ohmd/oh_prober.c
+++ b/src/xrt/drivers/ohmd/oh_prober.c
@@ -22,7 +22,7 @@
 
 DEBUG_GET_ONCE_BOOL_OPTION(oh_spew, "OH_PRINT_SPEW", false)
 DEBUG_GET_ONCE_BOOL_OPTION(oh_debug, "OH_PRINT_DEBUG", false)
-DEBUG_GET_ONCE_BOOL_OPTION(oh_external, "OH_EXTERNAL_DRIVER", false)
+DEBUG_GET_ONCE_BOOL_OPTION(ohmd_external, "OHMD_EXTERNAL_DRIVER", false)
 
 /*!
  * @implements xrt_auto_prober
@@ -100,9 +100,8 @@ oh_prober_autoprobe(struct xrt_auto_prober *xap,
 
 		prod = ohmd_list_gets(ohp->ctx, i, OHMD_PRODUCT);
 		if (strcmp(prod, "External Device") == 0 &&
-		    !debug_get_bool_option_oh_external()) {
-			OH_DEBUG(
-			    ohp,
+		    !debug_get_bool_option_ohmd_external()) {
+			U_LOG_D(
 			    "Rejecting device idx %i, is a External device.",
 			    i);
 			continue;