michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: fix LE Ping conditional compilations

Browse source 
Add additional conditional compilation of code not needed
when LE Ping is disabled in Kconfig.

Change-id: Idab40b1371488e06a6f2009fb553f7655b7b86f3
Signed-off-by: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
This commit is contained in:
Vinayak Chettimada 2016-12-29 17:22:25 +01:00 • committed by Johan Hedberg
commit 4fb2947b61
3 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/bluetooth/controller/hci/hci.c
View file

@ -1055,6 +1055,7 @@ static void enc_refresh_complete(struct pdu_data *pdu_data, uint16_t handle,
ep->handle = sys_cpu_to_le16(handle); ep->handle = sys_cpu_to_le16(handle);
} }
#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING)
static void auth_payload_timeout_exp(struct pdu_data *pdu_data, uint16_t handle, static void auth_payload_timeout_exp(struct pdu_data *pdu_data, uint16_t handle,
struct net_buf *buf) struct net_buf *buf)
{ {
@ -1065,6 +1066,7 @@ static void auth_payload_timeout_exp(struct pdu_data *pdu_data, uint16_t handle,
ep->handle = sys_cpu_to_le16(handle); ep->handle = sys_cpu_to_le16(handle);
} }
#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */
static void encode_control(struct radio_pdu_node_rx *node_rx, static void encode_control(struct radio_pdu_node_rx *node_rx,
struct pdu_data *pdu_data, struct net_buf *buf) struct pdu_data *pdu_data, struct net_buf *buf)
@ -1095,9 +1097,11 @@ static void encode_control(struct radio_pdu_node_rx *node_rx,
enc_refresh_complete(pdu_data, handle, buf); enc_refresh_complete(pdu_data, handle, buf);
break; break;
#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING)
case NODE_RX_TYPE_APTO: case NODE_RX_TYPE_APTO:
auth_payload_timeout_exp(pdu_data, handle, buf); auth_payload_timeout_exp(pdu_data, handle, buf);
break; break;
#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */
case NODE_RX_TYPE_RSSI: case NODE_RX_TYPE_RSSI:
/** @todo */ /** @todo */

8
subsys/bluetooth/controller/ll/ctrl.c
View file

@ -7668,7 +7668,11 @@ void radio_rx_dequeue(void)
case NODE_RX_TYPE_CONNECTION: case NODE_RX_TYPE_CONNECTION:
case NODE_RX_TYPE_CONN_UPDATE: case NODE_RX_TYPE_CONN_UPDATE:
case NODE_RX_TYPE_ENC_REFRESH: case NODE_RX_TYPE_ENC_REFRESH:
#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING)
case NODE_RX_TYPE_APTO: case NODE_RX_TYPE_APTO:
#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */
case NODE_RX_TYPE_RSSI: case NODE_RX_TYPE_RSSI:
#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) #if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR)
@ -7710,7 +7714,11 @@ void radio_rx_mem_release(struct radio_pdu_node_rx **radio_pdu_node_rx)
case NODE_RX_TYPE_CONNECTION: case NODE_RX_TYPE_CONNECTION:
case NODE_RX_TYPE_CONN_UPDATE: case NODE_RX_TYPE_CONN_UPDATE:
case NODE_RX_TYPE_ENC_REFRESH: case NODE_RX_TYPE_ENC_REFRESH:
#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING)
case NODE_RX_TYPE_APTO: case NODE_RX_TYPE_APTO:
#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */
case NODE_RX_TYPE_RSSI: case NODE_RX_TYPE_RSSI:
#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) #if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR)

5
subsys/bluetooth/controller/ll/ctrl.h
View file

@ -191,8 +191,13 @@ enum radio_pdu_node_rx_type {
NODE_RX_TYPE_TERMINATE, NODE_RX_TYPE_TERMINATE,
NODE_RX_TYPE_CONN_UPDATE, NODE_RX_TYPE_CONN_UPDATE,
NODE_RX_TYPE_ENC_REFRESH, NODE_RX_TYPE_ENC_REFRESH,
#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING)
NODE_RX_TYPE_APTO, NODE_RX_TYPE_APTO,
#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */
NODE_RX_TYPE_RSSI, NODE_RX_TYPE_RSSI,
#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) #if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR)
NODE_RX_TYPE_PROFILE, NODE_RX_TYPE_PROFILE,
#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ #endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */