Skip to content

Commit c2a09ab

Browse files
committed
BLE: Move SecurityDB related files into generic sources
1 parent 381700a commit c2a09ab

File tree

10 files changed

+9
-12
lines changed

10 files changed

+9
-12
lines changed

connectivity/FEATURE_BLE/include/ble/SecurityManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "ble/common/ble/blecommon.h"
2828

2929
#include "ble/common/ble/BLETypes.h"
30-
#include "ble/internal/SecurityDb.h"
3130
#include "ble/internal/PalConnectionMonitor.h"
3231
#include "ble/internal/PalSecurityManager.h"
3332

connectivity/FEATURE_BLE/source/FileSecurityDb.cpp renamed to connectivity/FEATURE_BLE/source/generic/FileSecurityDb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#if BLE_SECURITY_DATABASE_FILESYSTEM
2020

21-
#include "ble/internal/FileSecurityDb.h"
21+
#include "FileSecurityDb.h"
2222

2323
namespace ble {
2424

connectivity/FEATURE_BLE/include/ble/internal/FileSecurityDb.h renamed to connectivity/FEATURE_BLE/source/generic/FileSecurityDb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <stdio.h>
2525

26-
#include "ble/internal/SecurityDb.h"
26+
#include "SecurityDb.h"
2727

2828
namespace ble {
2929

connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,6 @@ ble_error_t GattClient::write(
11951195
const uint8_t *value
11961196
) const
11971197
{
1198-
// verify that there is no other procedures going on this connection
11991198
if (_is_reseting || get_control_block(connection_handle)) {
12001199
return BLE_ERROR_INVALID_STATE;
12011200
}
@@ -1218,7 +1217,6 @@ ble_error_t GattClient::write(
12181217
}
12191218
}
12201219
#endif // BLE_FEATURE_SIGNING
1221-
12221220
if (cmd == GATT_OP_WRITE_CMD) {
12231221
if (length > (uint16_t) (mtu - WRITE_HEADER_LENGTH)) {
12241222
return BLE_ERROR_PARAM_OUT_OF_RANGE;

connectivity/FEATURE_BLE/source/KVStoreSecurityDb.cpp renamed to connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#if BLE_SECURITY_DATABASE_KVSTORE
2020

21-
#include "ble/internal/KVStoreSecurityDb.h"
21+
#include "KVStoreSecurityDb.h"
2222

2323
namespace ble {
2424

connectivity/FEATURE_BLE/include/ble/internal/KVStoreSecurityDb.h renamed to connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "kvstore_global_api.h"
2525
#include "mbed_error.h"
2626

27-
#include "ble/internal/SecurityDb.h"
27+
#include "SecurityDb.h"
2828

2929
#define STR_EXPAND(tok) #tok
3030
#define STR(tok) STR_EXPAND(tok)

connectivity/FEATURE_BLE/include/ble/internal/MemorySecurityDb.h renamed to connectivity/FEATURE_BLE/source/generic/MemorySecurityDb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef GENERIC_MEMORY_SECURITY_DB_H_
2020
#define GENERIC_MEMORY_SECURITY_DB_H_
2121

22-
#include "ble/internal/SecurityDb.h"
22+
#include "SecurityDb.h"
2323

2424
namespace ble {
2525

connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
#include "SecurityManagerImpl.h"
2222
#include "ble/internal/PalSecurityManager.h"
23-
#include "ble/internal/MemorySecurityDb.h"
24-
#include "ble/internal/FileSecurityDb.h"
25-
#include "ble/internal/KVStoreSecurityDb.h"
23+
#include "MemorySecurityDb.h"
24+
#include "FileSecurityDb.h"
25+
#include "KVStoreSecurityDb.h"
2626

2727
using ble::advertising_peer_address_type_t;
2828
using ble::AuthenticationMask;

connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "ble/common/ble/GapTypes.h"
3131
#include "ble/common/ble/BLETypes.h"
32-
#include "ble/internal/SecurityDb.h"
32+
#include "SecurityDb.h"
3333
#include "ble/internal/PalConnectionMonitor.h"
3434
#include "ble/internal/PalSigningMonitor.h"
3535
#include "ble/internal/PalSecurityManager.h"

0 commit comments

Comments
 (0)