[GitHub] andrzej-kaczmarek closed pull request #1528: kernel/os: Fix os_trace APIs

[GitBox <gi...@apache.org>]

andrzej-kaczmarek closed pull request #1528: kernel/os: Fix os_trace APIs
URL: https://github.com/apache/mynewt-core/pull/1528
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/hw/mcu/nordic/nrf51xxx/src/nrf51_clock.c b/hw/mcu/nordic/nrf51xxx/src/nrf51_clock.c
index 0c6fcc5ca9..65019b004b 100644
--- a/hw/mcu/nordic/nrf51xxx/src/nrf51_clock.c
+++ b/hw/mcu/nordic/nrf51xxx/src/nrf51_clock.c
@@ -17,7 +17,9 @@
  * under the License.
  */
 #include <assert.h>
+#include <stdint.h>
 #include "mcu/nrf51_hal.h"
+#include "nrfx.h"
 
 static uint8_t nrf51_clock_hfxo_refcnt;
 
diff --git a/hw/mcu/nordic/nrf52xxx/src/nrf52_clock.c b/hw/mcu/nordic/nrf52xxx/src/nrf52_clock.c
index 9bdd0ac8d3..98b8a50b05 100644
--- a/hw/mcu/nordic/nrf52xxx/src/nrf52_clock.c
+++ b/hw/mcu/nordic/nrf52xxx/src/nrf52_clock.c
@@ -17,7 +17,9 @@
  * under the License.
  */
 #include <assert.h>
+#include <stdint.h>
 #include "mcu/nrf52_hal.h"
+#include "nrfx.h"
 
 static uint8_t nrf52_clock_hfxo_refcnt;
 
diff --git a/kernel/os/include/os/os_fault.h b/kernel/os/include/os/os_fault.h
index 63b13097d9..1a3c6f5171 100644
--- a/kernel/os/include/os/os_fault.h
+++ b/kernel/os/include/os/os_fault.h
@@ -20,6 +20,8 @@
 #ifndef _OS_FAULT_H
 #define _OS_FAULT_H
 
+#include "syscfg/syscfg.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libc/baselibc/include/assert.h b/libc/baselibc/include/assert.h
index 147f452503..15bc944af7 100644
--- a/libc/baselibc/include/assert.h
+++ b/libc/baselibc/include/assert.h
@@ -21,7 +21,7 @@ extern "C" {
 
 #else
 #include <stddef.h>
-#include "os/mynewt.h"
+#include "os/os_fault.h"
 
 #define assert(x) ((x) ? (void)0 : OS_CRASH())
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services