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

BLE - Remove conditionnal directive within services

pull/9790/head
Vincent Coubard 2019-02-28 11:23:05 +00:00
parent 06b26d4e8a
commit 3c9e778433
3 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/FEATURE_BLE/source/services/DFUService.cpp
View File

@ -14,11 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include "BLERoles.h"
#if BLE_FEATURE_GATT_SERVER
#if BLE_ROLE_BROADCASTER
#ifdef TARGET_NRF51822 /* DFU only supported on nrf51 platforms */ #ifdef TARGET_NRF51822 /* DFU only supported on nrf51 platforms */
#include "ble/services/DFUService.h" #include "ble/services/DFUService.h"
@ -47,6 +42,3 @@ const uint8_t DFUServicePacketCharacteristicUUID[] = {
DFUService::ResetPrepare_t DFUService::handoverCallback = NULL; DFUService::ResetPrepare_t DFUService::handoverCallback = NULL;
#endif /* #ifdef TARGET_NRF51822 */ #endif /* #ifdef TARGET_NRF51822 */
#endif // BLE_ROLE_BROADCASTER
#endif // BLE_FEATURE_GATT_SERVER

8
features/FEATURE_BLE/source/services/UARTService.cpp
View File

@ -14,11 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include "BLERoles.h"
#if BLE_FEATURE_GATT_SERVER
#if BLE_ROLE_BROADCASTER
#include "ble/services/UARTService.h" #include "ble/services/UARTService.h"
const uint8_t UARTServiceBaseUUID[UUID::LENGTH_OF_LONG_UUID] = { const uint8_t UARTServiceBaseUUID[UUID::LENGTH_OF_LONG_UUID] = {
@ -44,6 +39,3 @@ const uint8_t UARTServiceRXCharacteristicUUID[UUID::LENGTH_OF_LONG_UUID] = {
0x6E, 0x40, (uint8_t)(UARTServiceRXCharacteristicShortUUID >> 8), (uint8_t)(UARTServiceRXCharacteristicShortUUID & 0xFF), 0xB5, 0xA3, 0xF3, 0x93, 0x6E, 0x40, (uint8_t)(UARTServiceRXCharacteristicShortUUID >> 8), (uint8_t)(UARTServiceRXCharacteristicShortUUID & 0xFF), 0xB5, 0xA3, 0xF3, 0x93,
0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E,
}; };
#endif // BLE_ROLE_BROADCASTER
#endif // BLE_FEATURE_GATT_SERVER

8
features/FEATURE_BLE/source/services/URIBeaconConfigService.cpp
View File

@ -14,11 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include "BLERoles.h"
#if BLE_FEATURE_GATT_SERVER
#if BLE_ROLE_BROADCASTER
#include "ble/services/URIBeaconConfigService.h" #include "ble/services/URIBeaconConfigService.h"
#define UUID_URI_BEACON(FIRST, SECOND) { \ #define UUID_URI_BEACON(FIRST, SECOND) { \
@ -38,6 +33,3 @@ const uint8_t UUID_BEACON_PERIOD_CHAR[UUID::LENGTH_OF_LONG_UUID] = UUID_URI_B
const uint8_t UUID_RESET_CHAR[UUID::LENGTH_OF_LONG_UUID] = UUID_URI_BEACON(0x20, 0x89); const uint8_t UUID_RESET_CHAR[UUID::LENGTH_OF_LONG_UUID] = UUID_URI_BEACON(0x20, 0x89);
const uint8_t BEACON_UUID[sizeof(UUID::ShortUUIDBytes_t)] = {0xD8, 0xFE}; const uint8_t BEACON_UUID[sizeof(UUID::ShortUUIDBytes_t)] = {0xD8, 0xFE};
#endif // BLE_ROLE_BROADCASTER
#endif // BLE_FEATURE_GATT_SERVER