Commit 61eb655a authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Carles Cufi
Browse files

Bluetooth: Controller: Use ceiling_fraction function 



Use ceiling_fraction function instead of repeated explicit
code to ceil calculations.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent 1d922038

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c

+3 −3
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ static inline bool isr_rx_ci_adva_check(uint8_t tx_addr, uint8_t *addr, 
					struct pdu_adv *ci);



#if defined(CONFIG_BT_CTLR_ADV_EXT)

#define PAYLOAD_BASED_FRAG_COUNT ((CONFIG_BT_CTLR_ADV_DATA_LEN_MAX + \

				   PDU_AC_PAYLOAD_SIZE_MAX - 1) / \

#define PAYLOAD_BASED_FRAG_COUNT \

	ceiling_fraction(CONFIG_BT_CTLR_ADV_DATA_LEN_MAX, \

			 PDU_AC_PAYLOAD_SIZE_MAX)

#define PAYLOAD_FRAG_COUNT MAX(PAYLOAD_BASED_FRAG_COUNT, BT_CTLR_DF_PER_ADV_CTE_NUM_MAX)

#define BT_CTLR_ADV_AUX_SET  CONFIG_BT_CTLR_ADV_AUX_SET

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c

+1 −2
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ static void isr_tx(void *param) 


	/* LE Test Packet Interval */

	l = radio_tmr_end_get() - radio_tmr_ready_get();

	i = ((l + 249 + (SCAN_INT_UNIT_US - 1)) / SCAN_INT_UNIT_US) *

		SCAN_INT_UNIT_US;

	i = ceiling_fraction((l + 249), SCAN_INT_UNIT_US) * SCAN_INT_UNIT_US;

	t = radio_tmr_end_get() - l + i;

	t -= radio_tx_ready_delay_get(test_phy, test_phy_flags);

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c

+3 −3
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ static inline bool isr_rx_ci_adva_check(struct pdu_adv *adv, 
					struct pdu_adv *ci);



#if defined(CONFIG_BT_CTLR_ADV_EXT)

#define PAYLOAD_FRAG_COUNT   ((CONFIG_BT_CTLR_ADV_DATA_LEN_MAX + \

			       PDU_AC_PAYLOAD_SIZE_MAX - 1) / \

#define PAYLOAD_BASED_FRAG_COUNT \

	ceiling_fraction(CONFIG_BT_CTLR_ADV_DATA_LEN_MAX, \

			 PDU_AC_PAYLOAD_SIZE_MAX)

#define BT_CTLR_ADV_AUX_SET  CONFIG_BT_CTLR_ADV_AUX_SET

#if defined(CONFIG_BT_CTLR_ADV_PERIODIC)

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c

+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ static void isr_tx(void *param) 


	/* LE Test Packet Interval */

	l = radio_tmr_end_get() - radio_tmr_ready_get();

	i = ((l + 249 + (SCAN_INT_UNIT_US - 1)) / SCAN_INT_UNIT_US) *

		SCAN_INT_UNIT_US;

	i = ceiling_fraction((l + 249), SCAN_INT_UNIT_US) * SCAN_INT_UNIT_US;

	t = radio_tmr_end_get() - l + i;

	t -= radio_tx_ready_delay_get(test_phy, test_phy_flags);

subsys/bluetooth/controller/ll_sw/ull_adv.c

+2 −3
Original line number Diff line number Diff line
@@ -1221,9 +1221,8 @@ uint8_t ll_adv_enable(uint8_t enable) 
		interval_min_us = time_us +

				  (scan_delay + scan_window) * USEC_PER_MSEC;

		if ((interval * SCAN_INT_UNIT_US) < interval_min_us) {

			interval = (interval_min_us +

				(SCAN_INT_UNIT_US - 1)) /

				SCAN_INT_UNIT_US;

			interval = ceiling_fraction(interval_min_us,

						    SCAN_INT_UNIT_US);

		}



		/* passive scanning */

CRA Git | Maintained and supported by SUSTech CRA and CCSE