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

nimble/controller: Remove phy_data from non-phy builds

Browse Source 
phy_data is only initialized when PHY support is enabled so we can
remove it from non-phy builds to save some RAM.

This also fixes regression where phy_data was used without proper
initialization when PHY support was disabled.

X-Original-Commit: e4f3dfb767d29dbba5cc0b786388500d05d292b0
This commit is contained in:
Andrzej Kaczmarek
2017-07-04 09:30:27 +02:00
parent 79a62b0170
commit a3d773119e
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/include/controller/ble_ll_conn.h
+2 -1
View File
@@ -196,9 +196,10 @@ struct ble_ll_conn_sm
uint16_t eff_max_rx_time; uint16_t eff_max_rx_time;
uint8_t max_tx_octets_phy_mode[BLE_PHY_NUM_MODE]; uint8_t max_tx_octets_phy_mode[BLE_PHY_NUM_MODE];
/* XXX: TODO: could make this conditional */ #if (BLE_LL_BT5_PHY_SUPPORTED == 1)
struct ble_ll_conn_phy_data phy_data; struct ble_ll_conn_phy_data phy_data;
uint16_t phy_instant; uint16_t phy_instant;
#endif
/* Used to calculate data channel index for connection */ /* Used to calculate data channel index for connection */
uint8_t chanmap[BLE_LL_CONN_CHMAP_LEN]; uint8_t chanmap[BLE_LL_CONN_CHMAP_LEN];
nimble/controller/src/ble_ll_conn.c
+11
View File
@@ -988,8 +988,13 @@ ble_ll_conn_adjust_pyld_len(struct ble_ll_conn_sm *connsm, uint16_t pyld_len)
uint16_t phy_max_tx_octets; uint16_t phy_max_tx_octets;
uint16_t ret; uint16_t ret;
#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
phy_max_tx_octets = ble_ll_pdu_max_tx_octets_get(connsm->eff_max_tx_time, phy_max_tx_octets = ble_ll_pdu_max_tx_octets_get(connsm->eff_max_tx_time,
connsm->phy_data.tx_phy_mode); connsm->phy_data.tx_phy_mode);
#else
phy_max_tx_octets = ble_ll_pdu_max_tx_octets_get(connsm->eff_max_tx_time,
BLE_PHY_MODE_1M);
#endif
ret = pyld_len; ret = pyld_len;
@@ -1702,6 +1707,7 @@ ble_ll_conn_ext_master_init(struct ble_ll_conn_sm *connsm,
connsm->initial_params = *hcc; connsm->initial_params = *hcc;
} }
#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
static void static void
ble_ll_conn_set_phy(struct ble_ll_conn_sm *connsm, int tx_phy ,int rx_phy) ble_ll_conn_set_phy(struct ble_ll_conn_sm *connsm, int tx_phy ,int rx_phy)
{ {
@@ -1717,6 +1723,7 @@ ble_ll_conn_set_phy(struct ble_ll_conn_sm *connsm, int tx_phy ,int rx_phy)
phy_data->cur_tx_phy = tx_phy; phy_data->cur_tx_phy = tx_phy;
} }
#endif
void void
ble_ll_conn_ext_set_params(struct ble_ll_conn_sm *connsm, ble_ll_conn_ext_set_params(struct ble_ll_conn_sm *connsm,
@@ -1749,7 +1756,9 @@ ble_ll_conn_ext_set_params(struct ble_ll_conn_sm *connsm,
ble_ll_conn_calc_itvl_ticks(connsm); ble_ll_conn_calc_itvl_ticks(connsm);
#endif #endif
#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
ble_ll_conn_set_phy(connsm, tx_phy, rx_phy); ble_ll_conn_set_phy(connsm, tx_phy, rx_phy);
#endif
} }
@@ -2789,8 +2798,10 @@ ble_ll_init_rx_pkt_in(uint8_t pdu_type, uint8_t *rxbuf, struct ble_mbuf_hdr *ble
} }
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
/* Lets take last used phy */ /* Lets take last used phy */
ble_ll_conn_set_phy(connsm, ble_hdr->rxinfo.phy, ble_hdr->rxinfo.phy); ble_ll_conn_set_phy(connsm, ble_hdr->rxinfo.phy, ble_hdr->rxinfo.phy);
#endif
#endif #endif
ble_ll_conn_created(connsm, NULL); ble_ll_conn_created(connsm, NULL);
} else { } else {