ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

BLE: fix conflicting include by qualifying cordio pal includes
pull/10046/head
Martin Kojtal 2019-03-12 08:26:53 +01:00 committed by GitHub
parent 7661d2d913 abb2942fc5
commit 84e4decad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_audio_amp.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_bb.h
View File

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

6
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_bb_ble.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_bb_ble_tester.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_btn.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_cfg.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_crypto.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_io_exp.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_led.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_nvm.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_radio.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_rtc.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_sys.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_timer.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_twi.h
View File

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

2
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include/pal_uart.h
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

6
features/FEATURE_BLE/targets/TARGET_CORDIO/stack_adaptation/pal_mbed_os_adaptation.cpp
View File

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