Zephyr/nRFConnect change only: accommodate nRFConnect SDK version of …

…Zephyr. (#1207)

In commit 66b6b71 support for Zephyr 3.7.0-rc1 was added to ubxlib.  The few places where Zephyr made a breaking change at version 3.7.0 were put under a Zephyr version check in order that support for previous Zephyr versions wouldn't be broken.  nRFConnect 2.7.0 uses Zephyr version 3.6.99, and hence it was assumed that it would use the pre-version-3.7.0 Zephyr code.  However, it turns out that Zephyr version 3.6.99 does, in fact, **include** the breaking changes that [I thought] were made at Zephyr version 3.7.0; quite confusing.

To accommodate this behaviour, the two places where a version check against ">= Zephyr 3.7.0" are made are now modified to be ">= Zephyr 3.6.99" instead.

port/platform/zephyr/app/u_main.c

@@ -184,7 +184,7 @@ int main(void)
 }
 
 #ifdef U_DEBUG_UTILS_DUMP_THREADS
-# if KERNEL_VERSION_NUMBER >= ZEPHYR_VERSION(3,7,0)
+# if KERNEL_VERSION_NUMBER >= ZEPHYR_VERSION(3,6,99)
 void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *esf)
 # else
 void k_sys_fatal_error_handler(unsigned int reason, const z_arch_esf_t *esf)

port/platform/zephyr/src/u_port_os.c

@@ -166,7 +166,7 @@ static uPortOsThreadInstance_t *pGetNewThreadInstance(size_t stackSizeBytes)
             // K_KERNEL_STACK_LEN() will add extra space that Zephyr may require.
             // TODO: in the future we could use k_thread_stack_alloc() here and drop
             // the need for K_KERNEL_STACK_LEN()
-#if KERNEL_VERSION_NUMBER >= ZEPHYR_VERSION(3,7,0)
+#if KERNEL_VERSION_NUMBER >= ZEPHYR_VERSION(3,6,99)
             stackAllocSize = K_KERNEL_STACK_LEN(stackSizeBytes);
 #else
             stackAllocSize = Z_KERNEL_STACK_LEN(stackSizeBytes);