From 3880ae3e8168e759e19247edc73df3a34e45e987 Mon Sep 17 00:00:00 2001
From: "desmond.chen" <desmond.chen@arm.com>
Date: Mon, 5 Aug 2019 12:38:12 +0800
Subject: [PATCH] Fix include path issues on NRF5x with Cordio

---
 .../TARGET_NRF5x/stack/include/audio_board.h        |  2 +-
 .../TARGET_NRF5x/stack/sources/pal_bb.c             |  5 ++---
 .../TARGET_NRF5x/stack/sources/pal_bb_ble.c         | 13 ++++++-------
 .../TARGET_NRF5x/stack/sources/pal_cfg.c            |  2 +-
 .../TARGET_NRF5x/stack/sources/pal_crypto.c         |  4 ++--
 .../TARGET_NRF5x/stack/sources/pal_led.c            |  4 ++--
 .../TARGET_NRF5x/stack/sources/pal_nvm.c            |  2 +-
 .../TARGET_NRF5x/stack/sources/pal_rtc.c            |  2 +-
 .../TARGET_NRF5x/stack/sources/pal_sys.c            |  8 ++++----
 .../TARGET_NRF5x/stack/sources/pal_timer.c          |  2 +-
 .../TARGET_NRF5x/stack/sources/pal_twi.c            |  2 +-
 .../TARGET_NRF5x/stack/sources/pal_uart.c           |  2 +-
 12 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/include/audio_board.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/include/audio_board.h
index 0deee771dd..05cb6ce085 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/include/audio_board.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/include/audio_board.h
@@ -24,7 +24,7 @@
 #ifndef AUDIOBOARD_H
 #define AUDIOBOARD_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 #include "nrf_gpio.h"
 
 #ifdef __cplusplus
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb.c
index 8e84ba45a7..f9ed39323a 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb.c
@@ -21,9 +21,8 @@
  */
 /*************************************************************************************************/
 
-#include "pal_types.h"
-#include "pal_bb.h"
-#include "pal_bb.h"
+#include "stack/platform/include/pal_types.h"
+#include "stack/platform/include/pal_bb.h"
 #include "nrf.h"
 #include "nrf_timer.h"
 #include <string.h>
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble.c
index e5f2419619..1f26204310 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble.c
@@ -43,13 +43,12 @@
  *
  */
 
-#include "pal_types.h"
-#include "pal_bb.h"
-#include "pal_rtc.h"
-#include "pal_bb.h"
-#include "pal_led.h"
-#include "pal_bb_ble.h"
-#include "pal_radio.h"
+#include "stack/platform/include/pal_types.h"
+#include "stack/platform/include/pal_bb.h"
+#include "stack/platform/include/pal_rtc.h"
+#include "stack/platform/include/pal_led.h"
+#include "stack/platform/include/pal_bb_ble.h"
+#include "stack/platform/include/pal_radio.h"
 #include "ll_defs.h"
 #include "boards.h"
 #include "nrf.h"
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_cfg.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_cfg.c
index 749fc5a78b..f03c5e4c74 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_cfg.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_cfg.c
@@ -21,7 +21,7 @@
  */
 /*************************************************************************************************/
 
-#include "pal_cfg.h"
+#include "stack/platform/include/pal_cfg.h"
 #include "nrf.h"
 
 /**************************************************************************************************
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_crypto.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_crypto.c
index adf87e670d..c230adc5ef 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_crypto.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_crypto.c
@@ -21,8 +21,8 @@
  */
 /*************************************************************************************************/
 
-#include "pal_types.h"
-#include "pal_bb_ble.h"
+#include "stack/platform/include/pal_types.h"
+#include "stack/platform/include/pal_bb_ble.h"
 #if defined(NRF52840_XXAA) && defined(FEATURE_CRYPTOCELL310) && MBED_CONF_CORDIO_LL_NRF52840_CRYPTOCELL310_ACCELERATION
 #include "crys_rsa_kg.h"
 #include "crys_dh.h"
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_led.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_led.c
index 450c342913..5b6da04d84 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_led.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_led.c
@@ -21,9 +21,9 @@
  */
 /*************************************************************************************************/
 
-#include "pal_led.h"
+#include "stack/platform/include/pal_led.h"
 #include "boards.h"
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 /**************************************************************************************************
   Macros
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_nvm.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_nvm.c
index 1bbc8ad9e1..4baca50967 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_nvm.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_nvm.c
@@ -22,7 +22,7 @@
 /*************************************************************************************************/
 
 #include <string.h>
-#include "pal_nvm.h"
+#include "stack/platform/include/pal_nvm.h"
 #include "sdk_config.h"
 #if defined(NRF52840_XXAA)
 #include "nrfx_qspi.h"
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_rtc.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_rtc.c
index 30427e9b2a..ebdf3d95f5 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_rtc.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_rtc.c
@@ -22,7 +22,7 @@
 /*************************************************************************************************/
 
 #include "nrf.h"
-#include "pal_rtc.h"
+#include "stack/platform/include/pal_rtc.h"
 
 /*************************************************************************************************/
 /*!
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_sys.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_sys.c
index 1f53dd3bb4..10235e70c4 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_sys.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_sys.c
@@ -22,10 +22,10 @@
 /*************************************************************************************************/
 
 #include "nrf.h"
-#include "pal_bb.h"
-#include "pal_rtc.h"
-#include "pal_sys.h"
-#include "pal_led.h"
+#include "stack/platform/include/pal_bb.h"
+#include "stack/platform/include/pal_rtc.h"
+#include "stack/platform/include/pal_sys.h"
+#include "stack/platform/include/pal_led.h"
 #include "platform/mbed_power_mgmt.h"
 
 #include <string.h>
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c
index c00ae9c106..f59d4ec1eb 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c
@@ -34,7 +34,7 @@
  */
 
 #include "nrf.h"
-#include "pal_timer.h"
+#include "stack/platform/include/pal_timer.h"
 #include "nrf_gpio.h"
 
 /**************************************************************************************************
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_twi.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_twi.c
index b11ef1071b..5f30efd882 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_twi.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_twi.c
@@ -22,7 +22,7 @@
 /*************************************************************************************************/
 
 #include <string.h>
-#include "pal_twi.h"
+#include "stack/platform/include/pal_twi.h"
 #include "nrfx_twim.h"
 #include "nrf_twim.h"
 #include "app_util_platform.h"
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_uart.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_uart.c
index 034cbc7fc9..60f845db8c 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_uart.c
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_uart.c
@@ -21,7 +21,7 @@
  */
 /*************************************************************************************************/
 
-#include "pal_uart.h"
+#include "stack/platform/include/pal_uart.h"
 #include "sdk_config.h"
 #include "nrfx_uarte.h"
 #include "boards.h"