BLE: move PAL headers into source/pal

2020-08-21 17:41:53 +01:00 · 2020-08-21 17:41:53 +01:00 · e11bfb6514
parent a45325995b
commit e11bfb6514
34 changed files with 51 additions and 51 deletions
--- a/connectivity/FEATURE_BLE/include/ble/SecurityManager.h
+++ b/connectivity/FEATURE_BLE/include/ble/SecurityManager.h
@ -27,8 +27,6 @@
 #include "ble/common/ble/blecommon.h"

 #include "ble/common/ble/BLETypes.h"
-#include "ble/internal/PalConnectionMonitor.h"
-#include "ble/internal/PalSecurityManager.h"

 namespace ble {

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h
@ -25,16 +25,16 @@

 #include "CordioHCIDriver.h"
 #include "ble/GattServer.h"
-#include "PalAttClient.h"
-#include "PalGattClient.h"
+#include "source/pal/PalAttClient.h"
+#include "source/pal/PalGattClient.h"
 #include "ble/GattClient.h"
-#include "ble/internal/PalGap.h"
+#include "source/pal/PalGap.h"
 #include "ble/Gap.h"
-#include "PalGenericAccessService.h"
+#include "source/pal/PalGenericAccessService.h"
 #include "ble/SecurityManager.h"
-#include "PalEventQueue.h"
+#include "source/pal/PalEventQueue.h"
 #include "drivers/LowPowerTimer.h"
-#include "ble/internal/PalSecurityManager.h"
+#include "source/pal/PalSecurityManager.h"

 #include "source/generic/GapImpl.h"
 #include "source/generic/GattClientImpl.h"
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalAttClientImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalAttClientImpl.h
@ -19,9 +19,9 @@
 #ifndef IMPL_PAL_ATT_CLIENT_
 #define IMPL_PAL_ATT_CLIENT_

-#include "PalSimpleAttServerMessage.h"
+#include "source/pal/PalSimpleAttServerMessage.h"
 #include "att_api.h"
-#include "ble/internal/PalAttClient.h"
+#include "source/pal/PalAttClient.h"

 namespace ble {

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalEventQueueImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalEventQueueImpl.h
@ -20,7 +20,7 @@
 #define BLE_PAL_SIMPLE_EVENT_QUEUE_H_

 #include <new>
-#include "ble/internal/PalEventQueue.h"
+#include "source/pal/PalEventQueue.h"

 #include "wsf_buf.h"

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGapImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGapImpl.h
@ -19,7 +19,7 @@
 #ifndef IMPL_PAL_GAP_
 #define IMPL_PAL_GAP_

-#include "ble/internal/PalGap.h"
+#include "source/pal/PalGap.h"
 #include "dm_api.h"

 namespace ble {
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGattClientImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGattClientImpl.h
@ -19,7 +19,7 @@
 #ifndef BLE_PAL_ATTCLIENTTOGATTCLIENTADAPTER_H_
 #define BLE_PAL_ATTCLIENTTOGATTCLIENTADAPTER_H_

-#include "ble/internal/PalGattClient.h"
+#include "source/pal/PalGattClient.h"

 namespace ble {

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGenericAccessServiceImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalGenericAccessServiceImpl.h
@ -19,7 +19,7 @@
 #ifndef IMPL_PAL_GENERIC_ACCESS_SERVICE_
 #define IMPL_PAL_GENERIC_ACCESS_SERVICE_

-#include "ble/internal/PalGenericAccessService.h"
+#include "source/pal/PalGenericAccessService.h"
 #include "ble/Gap.h"

 namespace ble {
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h
@ -19,7 +19,7 @@
 #ifndef IMPL_PAL_SECURITY_MANAGER_
 #define IMPL_PAL_SECURITY_MANAGER_

-#include "ble/internal/PalSecurityManager.h"
+#include "source/pal/PalSecurityManager.h"
 #include "ble/common/ble/blecommon.h"
 #include "wsf_types.h"
 #include "wsf_os.h"
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSigningMonitorImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSigningMonitorImpl.h
@ -19,7 +19,7 @@
 #ifndef IMPL_PAL_SIGNING_MONITOR_H_
 #define IMPL_PAL_SIGNING_MONITOR_H_

-#include "ble/internal/PalSigningMonitor.h"
+#include "source/pal/PalSigningMonitor.h"

 namespace ble {

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp
@ -37,10 +37,10 @@
 #include "mbed_assert.h"
 #include "bstream.h"

-#include "ble/internal/PalAttClient.h"
-#include "ble/internal/PalSecurityManager.h"
-#include "ble/internal/PalGap.h"
-#include "ble/internal/PalSigningMonitor.h"
+#include "source/pal/PalAttClient.h"
+#include "source/pal/PalSecurityManager.h"
+#include "source/pal/PalGap.h"
+#include "source/pal/PalSigningMonitor.h"
 #include "source/BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "source/generic/GattServerImpl.h"
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp
@ -16,11 +16,11 @@
 * limitations under the License.
 */

-#include "ble/internal/PalAttClient.h"
+#include "source/pal/PalAttClient.h"
 #include "source/generic/GattServerImpl.h"
-#include "ble/internal/PalSimpleAttServerMessage.h"
-#include "ble/internal/PalGap.h"
-#include "ble/internal/PalGattClient.h"
+#include "source/pal/PalSimpleAttServerMessage.h"
+#include "source/pal/PalGap.h"
+#include "source/pal/PalGattClient.h"
 #include "source/BLEInstanceBase.h"

 #include "att_api.h"
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp
@ -16,7 +16,7 @@
 * limitations under the License.
 */

-#include "ble/internal/PalEventQueue.h"
+#include "source/pal/PalEventQueue.h"
 #include "source/BLEInstanceBase.h"

 namespace ble {
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGapImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGapImpl.cpp
@ -15,7 +15,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include "PalGap.h"
+#include "source/pal/PalGap.h"
 #include "hci_api.h"
 #include "dm_api.h"
 #include "dm_main.h"
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGattClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGattClientImpl.cpp
@ -16,8 +16,8 @@
 * limitations under the License.
 */

-#include "ble/internal/PalGattClient.h"
-#include "ble/internal/PalAttClient.h"
+#include "source/pal/PalGattClient.h"
+#include "source/pal/PalAttClient.h"

 namespace ble {

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGenericAccessServiceImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalGenericAccessServiceImpl.cpp
@ -16,7 +16,7 @@
 * limitations under the License.
 */

-#include "ble/internal/PalGenericAccessService.h"
+#include "source/pal/PalGenericAccessService.h"
 #include "source/generic/GattServerImpl.h"

 namespace ble {
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp
@ -21,8 +21,8 @@
 #include <string.h>

 #include "ble/common/ble/blecommon.h"
-#include "ble/internal/PalSecurityManager.h"
-#include "ble/internal/PalAttClient.h"
+#include "source/pal/PalSecurityManager.h"
+#include "source/pal/PalAttClient.h"
 #include "dm_api.h"
 #include "att_api.h"
 #include "smp_api.h"
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp
@ -16,7 +16,7 @@
 * limitations under the License.
 */

-#include "ble/internal/PalSigningMonitor.h"
+#include "source/pal/PalSigningMonitor.h"
 #include "source/BLEInstanceBase.h"

 namespace ble {
--- a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
@ -24,12 +24,12 @@
 #include "source/BLEInstanceBase.h"
 #include "ble/Gap.h"
 #include "ble/SecurityManager.h"
-#include "ble/internal/PalGap.h"
+#include "source/pal/PalGap.h"
 #include "ble/common/ble/GapEvents.h"
 #include "ble/common/ble/GapTypes.h"
-#include "ble/internal/PalGenericAccessService.h"
-#include "ble/internal/PalEventQueue.h"
-#include "ble/internal/PalGap.h"
+#include "source/pal/PalGenericAccessService.h"
+#include "source/pal/PalEventQueue.h"
+#include "source/pal/PalGap.h"

 #include "drivers/Timeout.h"

--- a/connectivity/FEATURE_BLE/source/generic/GapImpl.h
+++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.h
@ -36,12 +36,12 @@
 #include "ble/common/ble/gap/AdvertisingParameters.h"
 #include "ble/common/ble/gap/Events.h"

-#include "ble/internal/PalGap.h"
+#include "source/pal/PalGap.h"
 #include "ble/common/ble/GapEvents.h"
 #include "ble/common/ble/GapTypes.h"
-#include "ble/internal/PalEventQueue.h"
-#include "ble/internal/PalConnectionMonitor.h"
-#include "PalEventQueue.h"
+#include "source/pal/PalEventQueue.h"
+#include "source/pal/PalConnectionMonitor.h"
+#include "source/pal/PalEventQueue.h"

 #include "ble/Gap.h"

--- a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>

 #include "GattClientImpl.h"
-#include "ble/internal/AttServerMessage.h"
+#include "source/pal/AttServerMessage.h"
 #include "ble/common/ble/DiscoveredService.h"
 #include "ble/common/ble/DiscoveredCharacteristic.h"
 #include "ble/common/ble/blecommon.h"
--- a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.h
+++ b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.h
@ -30,8 +30,8 @@
 #include "ble/common/ble/ServiceDiscovery.h"
 #include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
 #include "ble/common/ble/GattCallbackParamTypes.h"
-#include "ble/internal/PalGattClient.h"
-#include "ble/internal/PalSigningMonitor.h"
+#include "source/pal/PalGattClient.h"
+#include "source/pal/PalSigningMonitor.h"
 #include "ble/GattClient.h"

 namespace ble {
--- a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.h
+++ b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.h
@ -35,7 +35,9 @@
 #include "SecurityManager.h"

 #include "ble/common/ble/GattCallbackParamTypes.h"
-#include "ble/internal/PalSigningMonitor.h"
+#include "source/pal/PalSigningMonitor.h"
+#include "source/BLEInstanceBase.h"
+

 namespace ble {

--- a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
@ -19,7 +19,7 @@
 #include "BLERoles.h"

 #include "SecurityManagerImpl.h"
-#include "ble/internal/PalSecurityManager.h"
+#include "source/pal/PalSecurityManager.h"
 #include "MemorySecurityDb.h"
 #include "FileSecurityDb.h"
 #include "KVStoreSecurityDb.h"
--- a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h
+++ b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h
@ -30,9 +30,9 @@
 #include "ble/common/ble/GapTypes.h"
 #include "ble/common/ble/BLETypes.h"
 #include "SecurityDb.h"
-#include "ble/internal/PalConnectionMonitor.h"
-#include "ble/internal/PalSigningMonitor.h"
-#include "ble/internal/PalSecurityManager.h"
+#include "source/pal/PalConnectionMonitor.h"
+#include "source/pal/PalSigningMonitor.h"
+#include "source/pal/PalSecurityManager.h"
 #include "ble/SecurityManager.h"

 namespace ble {
--- a/connectivity/FEATURE_BLE/include/ble/internal/AttServerMessage.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/AttServerMessage.h
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalAttClient.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalAttClient.h
@ -24,7 +24,7 @@
 #include "ble/common/ble/UUID.h"
 #include "ble/common/ble/BLETypes.h"
 #include "ble/common/ble/blecommon.h"
-#include "ble/internal/AttServerMessage.h"
+#include "AttServerMessage.h"

 namespace ble {
 namespace interface {
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalConnectionMonitor.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalConnectionMonitor.h
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalEventQueue.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalEventQueue.h
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalGap.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalGap.h
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalGattClient.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalGattClient.h
@ -24,7 +24,7 @@
 #include "ble/common/ble/UUID.h"
 #include "ble/common/ble/BLETypes.h"
 #include "ble/common/ble/blecommon.h"
-#include "ble/internal/AttServerMessage.h"
+#include "AttServerMessage.h"

 namespace ble {

--- a/connectivity/FEATURE_BLE/include/ble/internal/PalGenericAccessService.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalGenericAccessService.h
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalSecurityManager.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalSecurityManager.h
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalSigningMonitor.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalSigningMonitor.h
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalSimpleAttServerMessage.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalSimpleAttServerMessage.h
@ -19,7 +19,7 @@
 #ifndef BLE_PAL_SIMPLEATTSERVERMESSAGE_H_
 #define BLE_PAL_SIMPLEATTSERVERMESSAGE_H_

-#include "ble/internal/AttServerMessage.h"
+#include "AttServerMessage.h"

 namespace ble {