Merge pull request #10042 from paul-szczepanek-arm/fix-pal-paths

BLE: fix conflicting include by qualifying cordio pal includes

Author: 0xc0170

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/sec/common/sec_main.c

@@ -31,7 +31,7 @@
 #include "hci_api.h"
 #include "util/calc128.h"
 #include "util/wstr.h"
-#include "pal_crypto.h"
+#include "stack/platform/include/pal_crypto.h"
 
 /**************************************************************************************************
   Global Variables

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/sec/common/sec_main.h

@@ -23,7 +23,7 @@
 #define SEC_MAIN_H
 
 #include "hci_api.h"
-#include "pal_crypto.h"
+#include "stack/platform/include/pal_crypto.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_audio_amp.h

@@ -23,7 +23,7 @@
 #ifndef PAL_AUDIO_AMP_H
 #define PAL_AUDIO_AMP_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_bb.h

@@ -23,7 +23,7 @@
 #ifndef PAL_BB_H
 #define PAL_BB_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_bb_ble.h

@@ -23,9 +23,9 @@
 #ifndef PAL_BB_BLE_H
 #define PAL_BB_BLE_H
 
-#include "pal_bb.h"
-#include "pal_crypto.h"
-#include "pal_types.h"
+#include "stack/platform/include/pal_bb.h"
+#include "stack/platform/include/pal_crypto.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_bb_ble_tester.h

@@ -23,7 +23,7 @@
 #ifndef PAL_BB_BLE_TESTER_H
 #define PAL_BB_BLE_TESTER_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 /**************************************************************************************************
   Function Declarations

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_btn.h

@@ -23,7 +23,7 @@
 #ifndef PAL_BTN_H
 #define PAL_BTN_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_cfg.h

@@ -23,7 +23,7 @@
 #ifndef PAL_CFG_H
 #define PAL_CFG_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_crypto.h

@@ -23,7 +23,7 @@
 #ifndef PAL_CRYPTO_H
 #define PAL_CRYPTO_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_io_exp.h

@@ -23,7 +23,7 @@
 #ifndef PAL_IO_EXP_H
 #define PAL_IO_EXP_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_led.h

@@ -23,7 +23,7 @@
 #ifndef PAL_LED_H
 #define PAL_LED_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_nvm.h

@@ -23,7 +23,7 @@
 #ifndef PAL_NVM_H
 #define PAL_NVM_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_radio.h

@@ -23,7 +23,7 @@
 #ifndef PAL_RADIO_H
 #define PAL_RADIO_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_rtc.h

@@ -23,7 +23,7 @@
 #ifndef PAL_RTC_H
 #define PAL_RTC_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_sys.h

@@ -23,7 +23,7 @@
 #ifndef PAL_SYS_H
 #define PAL_SYS_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_timer.h

@@ -23,7 +23,7 @@
 #ifndef PAL_TIMER_H
 #define PAL_TIMER_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_twi.h

@@ -23,7 +23,7 @@
 #ifndef PAL_TWI_H
 #define PAL_TWI_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_uart.h

@@ -23,7 +23,7 @@
 #ifndef PAL_UART_H
 #define PAL_UART_H
 
-#include "pal_types.h"
+#include "stack/platform/include/pal_types.h"
 
 #ifdef __cplusplus
 extern "C" {

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources/port/baremetal/wsf_assert.c

@@ -23,7 +23,7 @@
 #include "wsf_types.h"
 #include "wsf_assert.h"
 #include "wsf_trace.h"
-#include "pal_sys.h"
+#include "stack/platform/include/pal_sys.h"
 
 /**************************************************************************************************
   Global Variables

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources/port/baremetal/wsf_bufio.c

@@ -28,7 +28,7 @@
 #include "wsf_cs.h"
 #include "wsf_os.h"
 
-#include "pal_uart.h"
+#include "stack/platform/include/pal_uart.h"
 
 /**************************************************************************************************
   Data Types

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources/port/baremetal/wsf_heap.c

@@ -27,7 +27,7 @@
 #include "wsf_os.h"
 #include "wsf_trace.h"
 #include "wsf_cs.h"
-#include "pal_sys.h"
+#include "stack/platform/include/pal_sys.h"
 
 /**************************************************************************************************
   Global Variables

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources/port/baremetal/wsf_nvm.c

@@ -23,7 +23,7 @@
 #include "wsf_types.h"
 #include "wsf_assert.h"
 #include "wsf_nvm.h"
-#include "pal_nvm.h"
+#include "stack/platform/include/pal_nvm.h"
 #include "util/crc32.h"
 
 /**************************************************************************************************

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources/port/baremetal/wsf_timer.c

@@ -26,9 +26,9 @@
 #include "wsf_assert.h"
 #include "wsf_cs.h"
 #include "wsf_trace.h"
-#include "pal_rtc.h"
-#include "pal_led.h"
-#include "pal_sys.h"
+#include "stack/platform/include/pal_rtc.h"
+#include "stack/platform/include/pal_led.h"
+#include "stack/platform/include/pal_sys.h"
 
 /**************************************************************************************************
   Macros

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources/port/baremetal/wsf_trace.c

@@ -27,7 +27,7 @@
 #include "wsf_buf.h"
 #include "wsf_cs.h"
 #include "util/print.h"
-#include "pal_sys.h"
+#include "stack/platform/include/pal_sys.h"
 #include <stdarg.h>
 
 /**************************************************************************************************

features/FEATURE_BLE/targets/TARGET_CORDIO/stack_adaptation/pal_mbed_os_adaptation.cpp

@@ -15,9 +15,9 @@
  */
 
 #include "mbed.h"
-#include "pal_types.h"
-#include "pal_uart.h"
-#include "pal_nvm.h"
+#include "stack/platform/include/pal_types.h"
+#include "stack/platform/include/pal_uart.h"
+#include "stack/platform/include/pal_nvm.h"
 #include "hal/ticker_api.h"
 
 #ifdef __cplusplus