michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Fix compiler warnings

Browse source 
Fix compiler warnings when PHY update feature is not selected.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-12-13 17:16:28 +05:30 • committed by Alberto Escolar
commit f95a7faa58
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -3321,6 +3321,7 @@ static inline void event_len_prep(struct ll_conn *conn)
} }
} }
#if defined(CONFIG_BT_CTLR_PHY)
static u16_t calc_eff_time(u8_t max_octets, u8_t phy, u16_t default_time) static u16_t calc_eff_time(u8_t max_octets, u8_t phy, u16_t default_time)
{ {
u16_t time = PKT_US(max_octets, phy); u16_t time = PKT_US(max_octets, phy);
@ -3337,6 +3338,7 @@ static u16_t calc_eff_time(u8_t max_octets, u8_t phy, u16_t default_time)
return eff_time; return eff_time;
} }
#endif /* CONFIG_BT_CTLR_PHY */
#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
#if defined(CONFIG_BT_CTLR_PHY) #if defined(CONFIG_BT_CTLR_PHY)
@ -4466,8 +4468,6 @@ static inline int length_req_rsp_recv(struct ll_conn *conn, memq_link_t *link,
struct pdu_data_llctrl_length_req *lr; struct pdu_data_llctrl_length_req *lr;
u16_t max_rx_octets; u16_t max_rx_octets;
u16_t max_tx_octets; u16_t max_tx_octets;
u16_t max_rx_time;
u16_t max_tx_time;
lr = &pdu_rx->llctrl.length_req; lr = &pdu_rx->llctrl.length_req;
@ -4490,6 +4490,9 @@ static inline int length_req_rsp_recv(struct ll_conn *conn, memq_link_t *link,
} }
#if defined(CONFIG_BT_CTLR_PHY) #if defined(CONFIG_BT_CTLR_PHY)
u16_t max_rx_time;
u16_t max_tx_time;
/* use the minimal of our default_tx_time and /* use the minimal of our default_tx_time and
* peer max_rx_time * peer max_rx_time
*/ */