From fce1fbfb246ea6a816095b75e34b764125fe72e0 Mon Sep 17 00:00:00 2001 From: Christopher Collins Date: Wed, 5 Jul 2017 19:14:30 -0700 Subject: [PATCH] BLE Host - Remove BLE_EDDYSTONE syscfg setting. This syscfg setting is unnecessary, as none of the eddystone code gets included in the final build if it isn't referenced. X-Original-Commit: b156b1f01288557cb6cdfc8642ce2d179ea420f8 --- nimble/host/include/host/ble_hs.h | 1 + nimble/host/src/ble_eddystone.c | 8 -------- nimble/host/syscfg.yml | 6 ------ 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/nimble/host/include/host/ble_hs.h b/nimble/host/include/host/ble_hs.h index 9fd15f052..85885bd4a 100644 --- a/nimble/host/include/host/ble_hs.h +++ b/nimble/host/include/host/ble_hs.h @@ -23,6 +23,7 @@ #include #include "nimble/hci_common.h" #include "host/ble_att.h" +#include "host/ble_eddystone.h" #include "host/ble_gap.h" #include "host/ble_gatt.h" #include "host/ble_hs_adv.h" diff --git a/nimble/host/src/ble_eddystone.c b/nimble/host/src/ble_eddystone.c index f19191d0e..1f1739309 100644 --- a/nimble/host/src/ble_eddystone.c +++ b/nimble/host/src/ble_eddystone.c @@ -123,10 +123,6 @@ ble_eddystone_set_adv_data_gen(struct ble_hs_adv_fields *adv_fields, int ble_eddystone_set_adv_data_uid(struct ble_hs_adv_fields *adv_fields, void *uid) { -#if !MYNEWT_VAL(BLE_EDDYSTONE) - return BLE_HS_ENOTSUP; -#endif - uint8_t *svc_data; int8_t tx_pwr; int rc; @@ -184,10 +180,6 @@ ble_eddystone_set_adv_data_url(struct ble_hs_adv_fields *adv_fields, uint8_t url_scheme, char *url_body, uint8_t url_body_len, uint8_t url_suffix) { -#if !MYNEWT_VAL(BLE_EDDYSTONE) - return BLE_HS_ENOTSUP; -#endif - uint8_t *svc_data; int8_t tx_pwr; int url_len; diff --git a/nimble/host/syscfg.yml b/nimble/host/syscfg.yml index 110d87e43..98dcdcc73 100644 --- a/nimble/host/syscfg.yml +++ b/nimble/host/syscfg.yml @@ -313,12 +313,6 @@ syscfg.defs: The rate that new random addresses should be generated (seconds). value: 300 - # Miscellaneous features. - BLE_EDDYSTONE: - description: > - Enables advertising of Eddystone beacons. - value: 1 - # Store settings. BLE_STORE_MAX_BONDS: description: >