michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: nix #ifdefs from packet_rx_acquired_count_get()

Browse source 
This calculation can be used in packet_rx_reserve_get() where currently
the code is duplicated from packet_rx_acquired_count_get().
Let's allow use of packet_rx_acquired_count_get() regardless of whether
CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH is enabled.

Change-Id: I613bde0a407f3caccabb22f369098575965e98ad
Signed-off-by: Michael Scott <michael.scott@linaro.org>
This commit is contained in:
Michael Scott 2017-05-09 23:30:35 -07:00 • committed by Johan Hedberg
commit 667a40a181
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -249,9 +249,7 @@ static void prepare_pdu_data_tx(struct connection *conn,
struct pdu_data **pdu_data_tx);
static void packet_rx_allocate(u8_t max);
#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH)
static u8_t packet_rx_acquired_count_get(void);
#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */
static struct radio_pdu_node_rx *packet_rx_reserve_get(u8_t count);
static void packet_rx_enqueue(void);
@ -6798,7 +6796,6 @@ static void packet_rx_allocate(u8_t max)
}
}
#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH)
static u8_t packet_rx_acquired_count_get(void)
{
if (_radio.packet_rx_acquire >=
@ -6811,7 +6808,6 @@ static u8_t packet_rx_acquired_count_get(void)
_radio.packet_rx_acquire);
}
}
#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */
static struct radio_pdu_node_rx *packet_rx_reserve_get(u8_t count)
{