espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-06 17:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/controller: Remove few not needed #ifdefs

Browse Source 
There is no need for special handling of single iteration loop as
compiler should catch this.

X-Original-Commit: 9878a220f4f9bd0fda1c4f452425cb3475a0a2d9
This commit is contained in:
Szymon Janc
2017-06-29 07:55:53 +02:00
parent 0ac066ca15
commit a21974068f
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/include/controller/ble_ll_adv.h
-2
View File
@@ -127,10 +127,8 @@ int ble_ll_adv_set_adv_params(uint8_t *cmd, uint8_t instance, int is_multi);
/* Read advertising channel power */ /* Read advertising channel power */
int ble_ll_adv_read_txpwr(uint8_t *rspbuf, uint8_t *rsplen); int ble_ll_adv_read_txpwr(uint8_t *rspbuf, uint8_t *rsplen);
#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
int ble_ll_adv_multi_adv_cmd(uint8_t *cmd, uint8_t cmdlen, uint8_t *rspbuf, int ble_ll_adv_multi_adv_cmd(uint8_t *cmd, uint8_t cmdlen, uint8_t *rspbuf,
uint8_t *rsplen); uint8_t *rsplen);
#endif
/*---- API used by BLE LL ----*/ /*---- API used by BLE LL ----*/
/* Send the connection complete event */ /* Send the connection complete event */
nimble/controller/src/ble_ll_adv.c
+1 -12
View File
@@ -1638,10 +1638,8 @@ ble_ll_adv_event_done(struct os_event *ev)
int int
ble_ll_adv_can_chg_whitelist(void) ble_ll_adv_can_chg_whitelist(void)
{ {
int rc;
struct ble_ll_adv_sm *advsm; struct ble_ll_adv_sm *advsm;
int rc;
#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
int i; int i;
rc = 1; rc = 1;
@@ -1653,15 +1651,6 @@ ble_ll_adv_can_chg_whitelist(void)
break; break;
} }
} }
#else
advsm = &g_ble_ll_adv_sm[0];
if (advsm->adv_enabled &&
(advsm->adv_filter_policy != BLE_HCI_ADV_FILT_NONE)) {
rc = 0;
} else {
rc = 1;
}
#endif
return rc; return rc;
} }