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

nimble/controller: Decrease size of struct ble_mbuf_hdr

Browse Source 
X-Original-Commit: 8fb67e3889a6a06066a3624db3bbcc9bb8990c35
This commit is contained in:
Łukasz Rymanowski
2017-09-07 10:44:29 +02:00
parent e9f824cfdb
commit 4e58b27242
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_adv.c
+3 -3
View File
@@ -2386,7 +2386,7 @@ ble_ll_adv_rx_isr_end(uint8_t pdu_type, struct os_mbuf *rxpdu, int crcok)
} else { } else {
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
rxhdr = BLE_MBUF_HDR_PTR(rxpdu); rxhdr = BLE_MBUF_HDR_PTR(rxpdu);
rxhdr->rxinfo.advsm = g_ble_ll_cur_adv_sm; rxhdr->rxinfo.user_data = g_ble_ll_cur_adv_sm;
#endif #endif
if (crcok) { if (crcok) {
if ((pdu_type == BLE_ADV_PDU_TYPE_SCAN_REQ) || if ((pdu_type == BLE_ADV_PDU_TYPE_SCAN_REQ) ||
@@ -2429,7 +2429,7 @@ ble_ll_adv_rx_pkt_in(uint8_t ptype, uint8_t *rxbuf, struct ble_mbuf_hdr *hdr)
struct ble_ll_adv_sm *advsm; struct ble_ll_adv_sm *advsm;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
advsm = (struct ble_ll_adv_sm *)hdr->rxinfo.advsm; advsm = (struct ble_ll_adv_sm *)hdr->rxinfo.user_data;
#else #else
advsm = &g_ble_ll_adv_sm[0]; advsm = &g_ble_ll_adv_sm[0];
#endif #endif
@@ -2837,7 +2837,7 @@ ble_ll_adv_send_conn_comp_ev(struct ble_ll_conn_sm *connsm,
struct ble_ll_adv_sm *advsm; struct ble_ll_adv_sm *advsm;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
advsm = (struct ble_ll_adv_sm *)rxhdr->rxinfo.advsm; advsm = (struct ble_ll_adv_sm *)rxhdr->rxinfo.user_data;
#else #else
advsm = &g_ble_ll_adv_sm[0]; advsm = &g_ble_ll_adv_sm[0];
#endif #endif
nimble/controller/src/ble_ll_scan.c
+6 -6
View File
@@ -1736,7 +1736,7 @@ ble_ll_scan_parse_ext_adv(struct os_mbuf *om, struct ble_mbuf_hdr *ble_hdr,
/* In the event we need information on primary and secondary PHY used during /* In the event we need information on primary and secondary PHY used during
* advertising. * advertising.
*/ */
aux_data = ble_hdr->rxinfo.aux_data; aux_data = ble_hdr->rxinfo.user_data;
if (!aux_data) { if (!aux_data) {
out_evt->prim_phy = ble_hdr->rxinfo.phy; out_evt->prim_phy = ble_hdr->rxinfo.phy;
goto done; goto done;
@@ -1942,7 +1942,7 @@ ble_ll_scan_rx_isr_end(struct os_mbuf *rxpdu, uint8_t crcok)
} }
} }
ble_hdr->rxinfo.aux_data = aux_data; ble_hdr->rxinfo.user_data = aux_data;
scansm->cur_aux_data = NULL; scansm->cur_aux_data = NULL;
rc = -1; rc = -1;
} }
@@ -2053,7 +2053,7 @@ ble_ll_scan_rx_isr_end(struct os_mbuf *rxpdu, uint8_t crcok)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
if (ble_hdr->rxinfo.channel < BLE_PHY_NUM_DATA_CHANS) { if (ble_hdr->rxinfo.channel < BLE_PHY_NUM_DATA_CHANS) {
/* Let's keep the aux ptr as a reference to scan rsp */ /* Let's keep the aux ptr as a reference to scan rsp */
scansm->cur_aux_data = ble_hdr->rxinfo.aux_data; scansm->cur_aux_data = ble_hdr->rxinfo.user_data;
STATS_INC(ble_ll_stats, aux_scan_req_tx); STATS_INC(ble_ll_stats, aux_scan_req_tx);
} }
#endif #endif
@@ -2298,11 +2298,11 @@ ble_ll_scan_rx_pkt_in(uint8_t ptype, struct os_mbuf *om, struct ble_mbuf_hdr *hd
} }
if (BLE_MBUF_HDR_AUX_INVALID(hdr)) { if (BLE_MBUF_HDR_AUX_INVALID(hdr)) {
ble_ll_scan_aux_data_free(hdr->rxinfo.aux_data); ble_ll_scan_aux_data_free(hdr->rxinfo.user_data);
goto scan_continue; goto scan_continue;
} }
aux_data = hdr->rxinfo.aux_data; aux_data = hdr->rxinfo.user_data;
/* Let's see if that packet contains aux ptr*/ /* Let's see if that packet contains aux ptr*/
if (BLE_MBUF_HDR_WAIT_AUX(hdr)) { if (BLE_MBUF_HDR_WAIT_AUX(hdr)) {
@@ -2329,7 +2329,7 @@ ble_ll_scan_rx_pkt_in(uint8_t ptype, struct os_mbuf *om, struct ble_mbuf_hdr *hd
if (!BLE_LL_CHECK_AUX_FLAG(aux_data, BLE_LL_AUX_CHAIN_BIT)) { if (!BLE_LL_CHECK_AUX_FLAG(aux_data, BLE_LL_AUX_CHAIN_BIT)) {
/* If there is no chaining, we can remove data. Otherwise it is /* If there is no chaining, we can remove data. Otherwise it is
* already scheduled for next aux*/ * already scheduled for next aux*/
ble_ll_scan_aux_data_free(hdr->rxinfo.aux_data); ble_ll_scan_aux_data_free(hdr->rxinfo.user_data);
} }
goto scan_continue; goto scan_continue;
nimble/drivers/nrf51/src/ble_phy.c
+1 -1
View File
@@ -660,7 +660,7 @@ ble_phy_rx_start_isr(void)
ble_hdr->rxinfo.handle = 0; ble_hdr->rxinfo.handle = 0;
ble_hdr->rxinfo.phy = BLE_PHY_1M; ble_hdr->rxinfo.phy = BLE_PHY_1M;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
ble_hdr->rxinfo.aux_data = NULL; ble_hdr->rxinfo.user_data = NULL;
#endif #endif
/* /*
nimble/drivers/nrf52/src/ble_phy.c
+1 -1
View File
@@ -789,7 +789,7 @@ ble_phy_rx_start_isr(void)
ble_hdr->rxinfo.handle = 0; ble_hdr->rxinfo.handle = 0;
ble_hdr->rxinfo.phy = ble_phy_get_cur_phy(); ble_hdr->rxinfo.phy = ble_phy_get_cur_phy();
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
ble_hdr->rxinfo.aux_data = NULL; ble_hdr->rxinfo.user_data = NULL;
#endif #endif
/* /*
nimble/include/nimble/ble.h
+1 -3
View File
@@ -68,9 +68,7 @@ struct ble_mbuf_hdr_rxinfo
int8_t rssi; int8_t rssi;
int8_t phy; int8_t phy;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
/* TODO this could be just one user-data pointer */ void *user_data;
void *advsm; /* advertising state machine */
void *aux_data;
#endif #endif
}; };