Commit 8a376a74 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Carles Cufi
Browse files

Bluetooth: Controller: Use strict cis_offset_min when CIG is active 



When there is an active CIG for a new CIS create, then use
strict cis_offset_min/cis_offset_max so that the new CIS
is scheduled inside the active CIG event.

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

subsys/bluetooth/controller/ll_sw/ull_central_iso.c

+13 −10
Original line number Diff line number Diff line
@@ -796,8 +796,9 @@ static void mfy_cig_offset_get(void *param) 
	struct ll_conn_iso_group *cig;

	uint32_t conn_interval_us;

	uint32_t ticks_to_expire;

	uint32_t offset_max_us;

	uint32_t offset_min_us;

	struct ll_conn *conn;

	uint32_t offset_us;

	int err;



	cis = param;
@@ -807,18 +808,20 @@ static void mfy_cig_offset_get(void *param) 
						 &ticks_to_expire);

	LL_ASSERT(!err);



	offset_us = HAL_TICKER_TICKS_TO_US(ticks_to_expire) +

		    (EVENT_TICKER_RES_MARGIN_US << 1U) +

		    cig->sync_delay - cis->sync_delay;

	offset_min_us = HAL_TICKER_TICKS_TO_US(ticks_to_expire) +

			(EVENT_TICKER_RES_MARGIN_US << 1U);

	offset_min_us += cig->sync_delay - cis->sync_delay;



	conn = ll_conn_get(cis->lll.acl_handle);



	conn_interval_us = (uint32_t)conn->lll.interval * CONN_INT_UNIT_US;

	while (offset_us > conn_interval_us) {

		offset_us -= conn_interval_us;

	while (offset_min_us > conn_interval_us) {

		offset_min_us -= conn_interval_us;

	}



	ull_cp_cc_offset_calc_reply(conn, offset_us);

	offset_max_us = conn_interval_us - cig->sync_delay;



	ull_cp_cc_offset_calc_reply(conn, offset_min_us, offset_max_us);

}



static void cis_offset_get(struct ll_conn_iso_stream *cis)
@@ -839,9 +842,9 @@ static void mfy_cis_offset_get(void *param) 
	struct ll_conn_iso_group *cig;

	uint32_t ticks_to_expire;

	uint32_t ticks_current;

	uint32_t offset_min_us;

	struct ll_conn *conn;

	uint32_t remainder;

	uint32_t offset_us;

	uint8_t ticker_id;

	uint16_t lazy;

	uint8_t retry;
@@ -909,12 +912,12 @@ static void mfy_cis_offset_get(void *param) 
	 */

	hal_ticker_remove_jitter(&ticks_to_expire, &remainder);



	offset_us = HAL_TICKER_TICKS_TO_US(ticks_to_expire) + remainder +

	offset_min_us = HAL_TICKER_TICKS_TO_US(ticks_to_expire) + remainder +

		    cig->sync_delay - cis->sync_delay;



	conn = ll_conn_get(cis->lll.acl_handle);



	ull_cp_cc_offset_calc_reply(conn, offset_us);

	ull_cp_cc_offset_calc_reply(conn, offset_min_us, offset_min_us);

}



static void ticker_op_cb(uint32_t status, void *param)

subsys/bluetooth/controller/ll_sw/ull_llcp.c

+3 −1
Original line number Diff line number Diff line
@@ -1233,13 +1233,15 @@ void ull_cp_cte_req_set_disable(struct ll_conn *conn) 
}

#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_REQ */



void ull_cp_cc_offset_calc_reply(struct ll_conn *conn, uint32_t cis_offset_min)

void ull_cp_cc_offset_calc_reply(struct ll_conn *conn, uint32_t cis_offset_min,

				 uint32_t cis_offset_max)

{

	struct proc_ctx *ctx;



	ctx = llcp_lr_peek(conn);

	if (ctx && ctx->proc == PROC_CIS_CREATE) {

		ctx->data.cis_create.cis_offset_min = cis_offset_min;

		ctx->data.cis_create.cis_offset_max = cis_offset_max;



		llcp_lp_cc_offset_calc_reply(conn, ctx);

	}

subsys/bluetooth/controller/ll_sw/ull_llcp.h

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ uint8_t ull_cp_cis_create(struct ll_conn *conn, struct ll_conn_iso_stream *cis); 
/**

 * @brief Resume CIS create after CIS offset calculation.

 */

void ull_cp_cc_offset_calc_reply(struct ll_conn *conn, uint32_t cis_offset_min);

void ull_cp_cc_offset_calc_reply(struct ll_conn *conn, uint32_t cis_offset_min,

				 uint32_t cis_offset_max);



/**

 * @brief Is ongoing create cis procedure expecting a reply?

CRA Git | Maintained and supported by SUSTech CRA and CCSE