This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new 692380d hw/mcu: Fix cmac build on Windows
692380d is described below
commit 692380dd90161cb263a211b381a8adbabb3490a1
Author: Jerzy Kasenberg <[email protected]>
AuthorDate: Thu Dec 2 10:44:56 2021 +0100
hw/mcu: Fix cmac build on Windows
Having include ../../../../../../apache-mynewt-core... in
os_arch_arm.c breaks build on Windows.
Adding include path to package seems to fix the problem.
---
hw/mcu/dialog/cmac/pkg.yml | 2 ++
hw/mcu/dialog/cmac/src/arch/cortex_m0_cmac/os_arch_arm.c | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/mcu/dialog/cmac/pkg.yml b/hw/mcu/dialog/cmac/pkg.yml
index 866cf51..fc04609 100644
--- a/hw/mcu/dialog/cmac/pkg.yml
+++ b/hw/mcu/dialog/cmac/pkg.yml
@@ -31,3 +31,5 @@ pkg.deps:
- "@apache-mynewt-core/hw/hal"
- "@apache-mynewt-core/hw/mcu/dialog"
- "@apache-mynewt-nimble/nimble/drivers/dialog_cmac"
+
+pkg.cflags: -I@apache-mynewt-core/kernel
diff --git a/hw/mcu/dialog/cmac/src/arch/cortex_m0_cmac/os_arch_arm.c
b/hw/mcu/dialog/cmac/src/arch/cortex_m0_cmac/os_arch_arm.c
index 329fd45..c63bc65 100644
--- a/hw/mcu/dialog/cmac/src/arch/cortex_m0_cmac/os_arch_arm.c
+++ b/hw/mcu/dialog/cmac/src/arch/cortex_m0_cmac/os_arch_arm.c
@@ -20,8 +20,7 @@
#include "mcu/mcu.h"
#include "hal/hal_os_tick.h"
#include "os/os_arch_cmac.h"
-/* XXX fix this... */
-#include "../../../../../../apache-mynewt-core/kernel/os/src/os_priv.h"
+#include "os/src/os_priv.h"
/* Initial program status register */
#define INITIAL_xPSR 0x01000000
