add broadcaster ifdef and pull headers into ifdef

Author: paul-szczepanek-arm

features/FEATURE_BLE/ble/services/URIBeaconConfigService.h

@@ -26,6 +26,7 @@
 #endif
 
 #if BLE_FEATURE_GATT_SERVER
+#if BLE_ROLE_BROADCASTER
 
 extern const uint8_t UUID_URI_BEACON_SERVICE[UUID::LENGTH_OF_LONG_UUID];
 extern const uint8_t UUID_LOCK_STATE_CHAR[UUID::LENGTH_OF_LONG_UUID];
@@ -482,6 +483,7 @@ class URIBeaconConfigService {
     }
 };
 
+#endif // BLE_ROLE_BROADCASTER
 #endif // BLE_FEATURE_GATT_SERVER
 
 #endif  // SERVICES_URIBEACONCONFIGSERVICE_H_

features/FEATURE_BLE/source/services/DFUService.cpp

@@ -16,10 +16,10 @@
 
 #ifdef TARGET_NRF51822 /* DFU only supported on nrf51 platforms */
 
-#include "ble/services/DFUService.h"
-
 #if BLE_FEATURE_GATT_SERVER
 
+#include "ble/services/DFUService.h"
+
 const uint8_t              DFUServiceBaseUUID[] = {
     0x00, 0x00, 0x00, 0x00, 0x12, 0x12, 0xEF, 0xDE,
     0x15, 0x23, 0x78, 0x5F, 0xEA, 0xBC, 0xD1, 0x23,

features/FEATURE_BLE/source/services/UARTService.cpp

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#include "ble/services/UARTService.h"
 
 #if BLE_FEATURE_GATT_SERVER
 
+#include "ble/services/UARTService.h"
+
 const uint8_t  UARTServiceBaseUUID[UUID::LENGTH_OF_LONG_UUID] = {
     0x6E, 0x40, 0x00, 0x00, 0xB5, 0xA3, 0xF3, 0x93,
     0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E,
@@ -42,4 +43,4 @@ const uint8_t  UARTServiceRXCharacteristicUUID[UUID::LENGTH_OF_LONG_UUID] = {
     0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E,
 };
 
-#endif // BLE_FEATURE_GATT_SERVER

features/FEATURE_BLE/source/services/URIBeaconConfigService.cpp

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-#include "ble/services/URIBeaconConfigService.h"
 
 #if BLE_FEATURE_GATT_SERVER
+#if BLE_ROLE_BROADCASTER
+
+#include "ble/services/URIBeaconConfigService.h"
 
 #define UUID_URI_BEACON(FIRST, SECOND) {                         \
         0xee, 0x0c, FIRST, SECOND, 0x87, 0x86, 0x40, 0xba,       \
@@ -36,4 +38,5 @@ const uint8_t UUID_RESET_CHAR[UUID::LENGTH_OF_LONG_UUID]            = UUID_URI_B
 
 const uint8_t BEACON_UUID[sizeof(UUID::ShortUUIDBytes_t)] = {0xD8, 0xFE};
 
+#endif // BLE_ROLE_BROADCASTER
 #endif // BLE_FEATURE_GATT_SERVER