Bluetooth: controller: split: Fix compiler warnings

cvinayak · aescolar · commit f95a7faa5859 · 2019-12-16T16:16:08.000+01:00
Fix compiler warnings when PHY update feature is not selected.

Signed-off-by: Vinayak Kariappa Chettimada &lt;vich@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -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)
 {
 	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;
 }
+#endif /* CONFIG_BT_CTLR_PHY */
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
 
 #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;
 		u16_t max_rx_octets;
 		u16_t max_tx_octets;
-		u16_t max_rx_time;
-		u16_t max_tx_time;
 
 		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)
+		u16_t max_rx_time;
+		u16_t max_tx_time;
+
 		/* use the minimal of our default_tx_time and
 		 * peer max_rx_time
 		 */

Original file line number	Diff line number	Diff line change
`@@ -3321,6 +3321,7 @@ static inline void event_len_prep(struct ll_conn *conn)`
`3321`	`3321`	`}`
`3322`	`3322`	`}`
`3323`	`3323`
	`3324`	`+#if defined(CONFIG_BT_CTLR_PHY)`
`3324`	`3325`	`static u16_t calc_eff_time(u8_t max_octets, u8_t phy, u16_t default_time)`
`3325`	`3326`	`{`
`3326`	`3327`	`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)`
`3337`	`3338`
`3338`	`3339`	`return eff_time;`
`3339`	`3340`	`}`
	`3341`	`+#endif /* CONFIG_BT_CTLR_PHY */`
`3340`	`3342`	`#endif /* CONFIG_BT_CTLR_DATA_LENGTH */`
`3341`	`3343`
`3342`	`3344`	`#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,`
`4466`	`4468`	`struct pdu_data_llctrl_length_req *lr;`
`4467`	`4469`	`u16_t max_rx_octets;`
`4468`	`4470`	`u16_t max_tx_octets;`
`4469`		`- u16_t max_rx_time;`
`4470`		`- u16_t max_tx_time;`
`4471`	`4471`
`4472`	`4472`	`lr = &pdu_rx->llctrl.length_req;`
`4473`	`4473`
`@@ -4490,6 +4490,9 @@ static inline int length_req_rsp_recv(struct ll_conn conn, memq_link_t link,`
`4490`	`4490`	`}`
`4491`	`4491`
`4492`	`4492`	`#if defined(CONFIG_BT_CTLR_PHY)`
	`4493`	`+ u16_t max_rx_time;`
	`4494`	`+ u16_t max_tx_time;`
	`4495`	`+`
`4493`	`4496`	`/* use the minimal of our default_tx_time and`
`4494`	`4497`	`* peer max_rx_time`
`4495`	`4498`	`*/`