michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix BT_CTLR_XTAL_ADVANCED cond. compilation

Browse source 
Fix compile warnings when BT_CTLR_XTAL_ADVANCED Kconfig
option is disabled.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2018-02-11 06:12:32 +01:00 • committed by Johan Hedberg
commit baf05409f8
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -277,9 +277,10 @@ static void connection_release(struct connection *conn);
static void terminate_ind_rx_enqueue(struct connection *conn, u8_t reason);
static u32_t conn_update(struct connection *conn, struct pdu_data *pdu_data_rx);
#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED)
#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED) && \
defined(CONFIG_BT_CTLR_SCHED_ADVANCED)
static u32_t conn_update_req(struct connection *conn);
#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */
#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED && CONFIG_BT_CTLR_SCHED_ADVANCED */
static u32_t chan_map_update(struct connection *conn,
struct pdu_data *pdu_data_rx);
@ -9050,7 +9051,8 @@ static u32_t conn_update(struct connection *conn, struct pdu_data *pdu_data_rx)
return 0;
}
#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED)
#if defined (CONFIG_BT_CTLR_XTAL_ADVANCED) && \
defined(CONFIG_BT_CTLR_SCHED_ADVANCED)
static u32_t conn_update_req(struct connection *conn)
{
if (conn->llcp_req != conn->llcp_ack) {
@ -9103,7 +9105,7 @@ static u32_t conn_update_req(struct connection *conn)
return 2;
}
#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */
#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED && CONFIG_BT_CTLR_SCHED_ADVANCED */
static u32_t chan_map_update(struct connection *conn,
struct pdu_data *pdu_data_rx)