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

fix(nimble): Fix compilation issues for various BLE roles

Browse Source
This commit is contained in:
Rahul Tank
2025-05-27 17:43:27 +05:30
parent 544e94303c
commit bcb5345e25
2 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/services/ans/src/ble_svc_ans.c
+8
View File
@@ -391,8 +391,12 @@ ble_svc_ans_new_alert_notify(uint8_t cat_id, const char * info_str)
memcpy(&ble_svc_ans_new_alert_val[2], info_str, info_str_len);
}
}
#if NIMBLE_BLE_CONNECT
return ble_gatts_notify(ble_svc_ans_conn_handle,
ble_svc_ans_new_alert_val_handle);
#else
return 0;
#endif
}
/**
@@ -408,8 +412,12 @@ ble_svc_ans_unr_alert_notify(uint8_t cat_id)
{
ble_svc_ans_unr_alert_stat[0] = cat_id;
ble_svc_ans_unr_alert_stat[1] = ble_svc_ans_unr_alert_cnt[cat_id];
#if NIMBLE_BLE_CONNECT
return ble_gatts_notify(ble_svc_ans_conn_handle,
ble_svc_ans_unr_alert_val_handle);
#else
return 0;
#endif
}
/**
nimble/host/src/ble_gap.c
+50 -22
View File
@@ -601,9 +601,8 @@ ble_gap_read_rem_ver_info(uint16_t conn_handle, uint8_t *version, uint16_t *manu
*version = conn->bhc_rd_rem_ver_params.version;
*manufacturer = conn->bhc_rd_rem_ver_params.manufacturer;
*subversion = conn->bhc_rd_rem_ver_params.subversion;
return 0;
#endif
return 0;
}
int
@@ -1045,7 +1044,7 @@ ble_gap_master_extract_state(struct ble_gap_master_state *out_state,
}
#endif
#if NIMBLE_BLE_ADVERTISE || NIMBLE_BLE_CONNECT
#if MYNEWT_VAL(BLE_PERIODIC_ADV_WITH_RESPONSES) || NIMBLE_BLE_ADVERTISE
static void
ble_gap_slave_extract_cb(uint8_t instance,
ble_gap_event_fn **out_cb, void **out_cb_arg)
@@ -1058,7 +1057,9 @@ ble_gap_slave_extract_cb(uint8_t instance,
ble_hs_unlock();
}
#endif
#if NIMBLE_BLE_ADVERTISE
static void
ble_gap_adv_finished(uint8_t instance, int reason, uint16_t conn_handle,
uint8_t num_events)
@@ -1166,7 +1167,7 @@ ble_gap_master_connect_cancelled(void)
}
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
static void
ble_gap_update_notify(uint16_t conn_handle, int status);
@@ -1774,7 +1775,11 @@ int ble_gap_ext_adv_active(uint8_t instance)
if (instance >= BLE_ADV_INSTANCES) {
return 0;
}
#if NIMBLE_BLE_ADVERTISE || NIMBLE_BLE_CONNECT
return ble_gap_adv_active_instance(instance);
#else
return 0;
#endif
}
#endif
@@ -1963,6 +1968,7 @@ ble_gap_rx_ext_adv_report(struct ble_gap_ext_disc_desc *desc)
void
ble_gap_rx_adv_set_terminated(const struct ble_hci_ev_le_subev_adv_set_terminated *ev)
{
#if NIMBLE_BLE_ADVERTISE
uint16_t conn_handle;
int reason;
@@ -1977,6 +1983,7 @@ ble_gap_rx_adv_set_terminated(const struct ble_hci_ev_le_subev_adv_set_terminate
}
ble_gap_adv_finished(ev->adv_handle, reason, conn_handle, ev->num_events);
#endif
}
static void
@@ -2019,7 +2026,7 @@ ble_gap_rx_peroidic_adv_sync_estab(const struct ble_hci_ev_le_subev_periodic_adv
struct ble_gap_event event;
ble_gap_event_fn *cb;
void *cb_arg;
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
int rc;
#endif
memset(&event, 0, sizeof event);
@@ -2034,7 +2041,7 @@ ble_gap_rx_peroidic_adv_sync_estab(const struct ble_hci_ev_le_subev_periodic_adv
if (!ev->status) {
sync_handle = le16toh(ev->sync_handle);
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
if (ble_conn_reattempt.sync_reattempt) {
ble_conn_reattempt.sync_reattempt = 0;
}
@@ -2063,7 +2070,7 @@ ble_gap_rx_peroidic_adv_sync_estab(const struct ble_hci_ev_le_subev_periodic_adv
ble_hs_periodic_sync_insert(ble_gap_sync.psync);
} else {
ble_hs_periodic_sync_free(ble_gap_sync.psync);
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
if (ev->status == BLE_ERR_CONN_ESTABLISHMENT) {
if (ble_conn_reattempt.count < MAX_REATTEMPT_ALLOWED) {
if (ble_gap_sync.op == BLE_GAP_OP_SYNC) {
@@ -2086,7 +2093,7 @@ ble_gap_rx_peroidic_adv_sync_estab(const struct ble_hci_ev_le_subev_periodic_adv
}
#endif
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
if (!ble_conn_reattempt.sync_reattempt || ble_conn_reattempt.count >= MAX_REATTEMPT_ALLOWED) {
memset(&ble_conn_reattempt.periodic_addr, 0, sizeof(ble_addr_t));
ble_conn_reattempt.adv_sid = 0;
@@ -2105,7 +2112,7 @@ ble_gap_rx_peroidic_adv_sync_estab(const struct ble_hci_ev_le_subev_periodic_adv
if (cb) {
cb(&event, cb_arg);
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
}
#endif
ble_hs_unlock();
@@ -2587,7 +2594,7 @@ ble_gap_rd_rem_sup_feat_tx(uint16_t handle)
BLE_HCI_OCF_LE_RD_REM_FEAT),
&cmd, sizeof(cmd), NULL, 0);
}
#endif
static int
ble_gap_rd_rem_ver_tx(uint16_t handle)
{
@@ -2599,7 +2606,7 @@ ble_gap_rd_rem_ver_tx(uint16_t handle)
BLE_HCI_OCF_RD_REM_VER_INFO),
&cmd, sizeof(cmd), NULL, 0);
}
#endif
/**
* Processes an incoming connection-complete HCI event.
@@ -2634,9 +2641,11 @@ ble_gap_rx_conn_complete(struct ble_gap_conn_complete *evt, uint8_t instance)
* with ext advertising this is send from set terminated event
*/
#if !MYNEWT_VAL(BLE_EXT_ADV)
#if NIMBLE_BLE_ADVERTISE
if (ble_gap_adv_active()) {
ble_gap_adv_finished(0, 0, 0, 0);
}
#endif
#endif
break;
case BLE_ERR_UNK_CONN_ID:
@@ -2807,9 +2816,11 @@ ble_gap_event_connect_call(uint16_t conn_handle, int status)
event.connect.sync_handle = pawr_sync_handle;
event.connect.adv_handle = pawr_adv_handle;
#endif
ble_gap_event_listener_call(&event);
#if NIMBLE_BLE_CONNECT
ble_gap_call_conn_event_cb(&event, handle);
#endif
//TODO : Remove duplication of event
event.type = BLE_GAP_EVENT_LINK_ESTAB;
@@ -2822,7 +2833,9 @@ ble_gap_event_connect_call(uint16_t conn_handle, int status)
#endif
ble_gap_event_listener_call(&event);
#if NIMBLE_BLE_CONNECT
ble_gap_call_conn_event_cb(&event, handle);
#endif
ble_hs_hci_util_set_data_len(le16toh(conn_handle), BLE_HCI_SUGG_DEF_DATALEN_TX_OCTETS_MAX,
BLE_HCI_SUGG_DEF_DATALEN_TX_TIME_MAX);
@@ -2949,7 +2962,7 @@ static int32_t
ble_gap_master_timer(void)
{
uint32_t ticks_until_exp;
#if NIMBLE_BLE_SCAN || NIMBLE_BLE_CONNECT
#if NIMBLE_BLE_CONNECT || (NIMBLE_BLE_SCAN && !MYNEWT_VAL(BLE_EXT_ADV))
int rc;
#endif
@@ -3489,12 +3502,14 @@ ble_gap_adv_validate(uint8_t own_addr_type, const ble_addr_t *peer_addr,
return BLE_HS_EINVAL;
}
#if NIMBLE_BLE_CONNECT
/* Don't allow connectable advertising if we won't be able to allocate
* a new connection.
*/
if (!ble_hs_conn_can_alloc()) {
return BLE_HS_ENOMEM;
}
#endif
break;
case BLE_GAP_CONN_MODE_DIR:
@@ -3549,7 +3564,7 @@ ble_gap_adv_start(uint8_t own_addr_type, const ble_addr_t *direct_addr,
goto done;
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
ble_adv_reattempt.type = 0;
ble_adv_reattempt.own_addr_type = own_addr_type;
@@ -3699,7 +3714,7 @@ ble_gap_adv_set_fields(const struct ble_hs_adv_fields *adv_fields)
if (!ble_hs_is_enabled()) {
return BLE_HS_EDISABLED;
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
memcpy(&ble_adv_reattempt.fields, adv_fields, sizeof( struct ble_hs_adv_fields));
#endif
@@ -4014,7 +4029,7 @@ ble_gap_ext_adv_configure(uint8_t instance,
return rc;
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
ble_adv_reattempt.instance = instance;
memcpy(&ble_adv_reattempt.params, params, sizeof(struct ble_gap_ext_adv_params));
@@ -4033,10 +4048,12 @@ ble_gap_ext_adv_configure(uint8_t instance,
ble_hs_lock();
#if NIMBLE_BLE_ADVERTISE || NIMBLE_BLE_CONNECT
if (ble_gap_adv_active_instance(instance)) {
ble_hs_unlock();
return BLE_HS_EBUSY;
}
#endif
rc = ble_gap_ext_adv_params_tx(instance, params, selected_tx_power);
if (rc) {
@@ -4148,7 +4165,7 @@ ble_gap_ext_adv_start(uint8_t instance, int duration, int max_events)
return BLE_HS_EDISABLED;
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
ble_adv_reattempt.type = 1;
ble_adv_reattempt.instance = instance;
ble_adv_reattempt.duration = duration;
@@ -4249,14 +4266,18 @@ ble_gap_ext_adv_stop_no_lock(uint8_t instance)
struct ble_hci_le_set_ext_adv_enable_cp *cmd;
uint8_t buf[sizeof(*cmd) + sizeof(cmd->sets[0])];
uint16_t opcode;
#if NIMBLE_BLE_ADVERTISE || NIMBLE_BLE_CONNECT
bool active;
#endif
int rc;
if (!ble_gap_slave[instance].configured) {
return BLE_HS_EINVAL;
}
#if NIMBLE_BLE_ADVERTISE || NIMBLE_BLE_CONNECT
active = ble_gap_adv_active_instance(instance);
#endif
BLE_HS_LOG(INFO, "GAP procedure initiated: stop extended advertising.\n");
@@ -4277,11 +4298,15 @@ ble_gap_ext_adv_stop_no_lock(uint8_t instance)
ble_gap_slave[instance].op = BLE_GAP_OP_NULL;
#if NIMBLE_BLE_ADVERTISE || NIMBLE_BLE_CONNECT
if (!active) {
return BLE_HS_EALREADY;
} else {
return 0;
}
#endif
return 0;
}
int
@@ -4441,7 +4466,7 @@ ble_gap_ext_adv_set_data(uint8_t instance, struct os_mbuf *data)
goto done;
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
uint16_t len = OS_MBUF_PKTLEN(data);
ble_adv_reattempt.type = 1;
@@ -5110,7 +5135,7 @@ ble_gap_periodic_adv_sync_create(const ble_addr_t *addr, uint8_t adv_sid,
return BLE_HS_ENOMEM;
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
ble_conn_reattempt.adv_sid = adv_sid;
if (addr != NULL ) {
@@ -7162,7 +7187,7 @@ ble_gap_ext_connect(uint8_t own_addr_type, const ble_addr_t *peer_addr,
ble_gap_master.op = BLE_GAP_OP_M_CONN;
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
ble_conn_reattempt.own_addr_type = own_addr_type;
if (peer_addr != NULL) {
@@ -7354,7 +7379,7 @@ ble_gap_connect(uint8_t own_addr_type, const ble_addr_t *peer_addr,
memset(&bhc_peer_addr, 0, sizeof bhc_peer_addr);
}
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
ble_conn_reattempt.own_addr_type = own_addr_type;
if (peer_addr != NULL) {
ble_conn_reattempt.peer_addr_present = 1;
@@ -8058,8 +8083,9 @@ ble_gap_set_data_len(uint16_t conn_handle, uint16_t tx_octets,
event.data_len_chg.conn_handle = conn_handle;
ble_gap_event_listener_call(&event);
#if NIMBLE_BLE_CONNECT
ble_gap_call_conn_event_cb(&event, conn_handle);
#endif
return 0;
}
@@ -9434,10 +9460,12 @@ ble_gap_host_check_status(void)
}
#else
#if NIMBLE_BLE_ADVERTISE || NIMBLE_BLE_CONNECT
if (ble_gap_adv_active_instance(0)) {
BLE_HS_LOG(ERROR, "Gap Advertising is active \n");
status |= BIT(BLE_GAP_STATUS_ADV);
}
#endif
#endif
/* Stop scanning */