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

nimble/mesh: Use ble_gap_event_listener instead of ble_gap_mesh_cb

Browse Source 
Use generic listener mechanism instead of dedicated Mesh callback.
This commit is contained in:
Michał Narajowski
2019-02-11 15:21:07 +01:00
parent 7ef718c120
commit bea94a0592
3 changed files with 5 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/include/host/ble_gap.h
-4
View File
@@ -1298,10 +1298,6 @@ int ble_gap_event_listener_register(struct ble_gap_event_listener *listener,
*/
int ble_gap_event_listener_unregister(struct ble_gap_event_listener *listener);
#if MYNEWT_VAL(BLE_MESH)
int ble_gap_mesh_cb_register(ble_gap_event_fn *cb, void *cb_arg);
#endif
#ifdef __cplusplus
}
#endif
nimble/host/mesh/src/mesh.c
+3 -1
View File
@@ -32,6 +32,7 @@
#include "settings.h"
u8_t g_mesh_addr_type;
static struct ble_gap_event_listener mesh_event_listener;
int bt_mesh_provision(const u8_t net_key[16], u16_t net_idx,
u8_t flags, u32_t iv_index, u16_t addr,
@@ -333,7 +334,8 @@ int bt_mesh_init(uint8_t own_addr_type, const struct bt_mesh_prov *prov,
bt_mesh_proxy_prov_enable();
#endif
ble_gap_mesh_cb_register(bt_mesh_gap_event, NULL);
ble_gap_event_listener_register(&mesh_event_listener,
bt_mesh_gap_event, NULL);
#if (MYNEWT_VAL(BLE_MESH_SETTINGS))
bt_mesh_settings_init();
nimble/host/src/ble_gap.c
+2 -46
View File
@@ -131,13 +131,6 @@ struct ble_gap_master_state {
};
static bssnz_t struct ble_gap_master_state ble_gap_master;
#if MYNEWT_VAL(BLE_MESH)
struct ble_gap_mesh_state {
ble_gap_event_fn *cb;
void *cb_arg;
} ble_gap_mesh;
#endif
/**
* The state of the in-progress slave connection. If no slave connection is
* currently in progress, then the op field is set to BLE_GAP_OP_NULL.
@@ -577,17 +570,6 @@ ble_gap_set_prefered_le_phy(uint16_t conn_handle, uint8_t tx_phys_mask,
buf, sizeof(buf), NULL, 0, NULL);
}
#if MYNEWT_VAL(BLE_MESH)
int
ble_gap_mesh_cb_register(ble_gap_event_fn *cb, void *cb_arg)
{
ble_gap_mesh.cb = cb;
ble_gap_mesh.cb_arg = cb_arg;
return 0;
}
#endif
/*****************************************************************************
* $misc *
*****************************************************************************/
@@ -803,11 +785,7 @@ ble_gap_disc_report(void *desc)
state.cb(&event, state.cb_arg);
}
#if MYNEWT_VAL(BLE_MESH)
if (ble_gap_mesh.cb) {
ble_gap_mesh.cb(&event, ble_gap_mesh.cb_arg);
}
#endif
ble_gap_event_listener_call(&event);
}
#if NIMBLE_BLE_SCAN
@@ -826,11 +804,7 @@ ble_gap_disc_complete(void)
ble_gap_call_event_cb(&event, state.cb, state.cb_arg);
}
#if MYNEWT_VAL(BLE_MESH)
if (ble_gap_mesh.cb) {
ble_gap_mesh.cb(&event, ble_gap_mesh.cb_arg);
}
#endif
ble_gap_event_listener_call(&event);
}
#endif
@@ -1043,12 +1017,6 @@ ble_gap_conn_broken(uint16_t conn_handle, int reason)
ble_gap_event_listener_call(&event);
ble_gap_call_event_cb(&event, snap.cb, snap.cb_arg);
#if MYNEWT_VAL(BLE_MESH)
if (ble_gap_mesh.cb) {
ble_gap_mesh.cb(&event, ble_gap_mesh.cb_arg);
}
#endif
STATS_INC(ble_gap_stats, disconnect);
}
@@ -1475,12 +1443,6 @@ ble_gap_rx_conn_complete(struct hci_le_conn_complete *evt, uint8_t instance)
ble_gap_event_listener_call(&event);
ble_gap_call_conn_event_cb(&event, evt->connection_handle);
#if MYNEWT_VAL(BLE_MESH)
if (ble_gap_mesh.cb) {
ble_gap_mesh.cb(&event, ble_gap_mesh.cb_arg);
}
#endif
ble_gap_rd_rem_sup_feat_tx(evt->connection_handle);
return 0;
@@ -4625,12 +4587,6 @@ ble_gap_subscribe_event(uint16_t conn_handle, uint16_t attr_handle,
ble_gap_event_listener_call(&event);
ble_gap_call_conn_event_cb(&event, conn_handle);
#if MYNEWT_VAL(BLE_MESH)
if (ble_gap_mesh.cb) {
ble_gap_mesh.cb(&event, ble_gap_mesh.cb_arg);
}
#endif
}
/*****************************************************************************