bluetooth: host: Interval is deprecated, use interval_us

weeTike · weeTike · commit d09598936181 · 2025-11-25T10:22:24.000Z
With the introduction of Shorter Connection Intervals, Zephyr has
deprecated bt_conn_le_info.interval in favour of
bt_conn_le_info.interval_us. Changing the unit from 1.25 milliseconds to
microseconds.

Signed-off-by: Timothy Keys &lt;timothy.keys@nordicsemi.no&gt;
diff --git a/applications/nrf5340_audio/unicast_client/main.c b/applications/nrf5340_audio/unicast_client/main.c
@@ -288,7 +288,7 @@ static void le_audio_msg_sub_thread(void)
 			if (ret) {
 				LOG_ERR("Failed to get conn info");
 			} else {
-				interval = conn_info.le.interval;
+				interval = BT_GAP_US_TO_CONN_INTERVAL(conn_info.le.interval_us);
 			}
 
 			/* Only update conn param once */
diff --git a/applications/nrf_desktop/src/modules/ble_conn_params.c b/applications/nrf_desktop/src/modules/ble_conn_params.c
@@ -23,11 +23,12 @@
 LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_BLE_CONN_PARAMS_LOG_LEVEL);
 
 #define CONN_INTERVAL_LLPM_US		1000   /* 1 ms */
-#define CONN_INTERVAL_LLPM_REG		0x0d01 /* 1 ms */
 #if (CONFIG_CAF_BLE_USE_LLPM && (CONFIG_BT_MAX_CONN >= 2))
  #define CONN_INTERVAL_BLE_REG		0x0008 /* 10 ms */
+ #define CONN_INTERVAL_BLE_US           10000
 #else
  #define CONN_INTERVAL_BLE_REG		0x0006 /* 7.5 ms */
+ #define CONN_INTERVAL_BLE_US           7500
 #endif
 #define CONN_SUPERVISION_TIMEOUT	400
 
@@ -77,8 +78,10 @@ static int set_le_conn_param(struct bt_conn *conn, uint16_t interval, uint16_t l
 	return bt_conn_le_param_update(conn, &param);
 }
 
-static int interval_reg_to_us(uint16_t reg)
+/* Handle llpm encoding in interval_us values */
+static int strip_llpm_encoding_to_us(uint32_t interval_us)
 {
+	uint16_t reg = BT_GAP_US_TO_CONN_INTERVAL(interval_us);
 	bool is_llpm = ((reg & 0x0d00) == 0x0d00) ? true : false;
 
 	return (reg & BIT_MASK(8)) * ((is_llpm) ? 1000 : 1250);
@@ -128,7 +131,7 @@ static int set_conn_params(struct connected_peer *peer)
 			LOG_ERR("Cannot get conn info (%d)", err);
 			return err;
 		}
-		uint32_t curr_ci_us = interval_reg_to_us(info.le.interval);
+		uint32_t curr_ci_us = strip_llpm_encoding_to_us(info.le.interval_us);
 
 		if (curr_ci_us > CONN_INTERVAL_PRE_LLPM_MAX_US) {
 			err = set_le_conn_param(peer->conn, CONN_INTERVAL_BLE_REG,
@@ -192,13 +195,14 @@ static bool conn_params_update_required(struct connected_peer *peer)
 
 	__ASSERT_NO_MSG(info.role == BT_CONN_ROLE_CENTRAL);
 
+	uint32_t interval_us = strip_llpm_encoding_to_us(info.le.interval_us);
 	if (IS_ENABLED(CONFIG_DESKTOP_BLE_USB_MANAGED_CI) && usb_suspended) {
-		if ((info.le.interval != CONN_INTERVAL_USB_SUSPEND) ||
+		if ((interval_us != BT_CONN_INTERVAL_TO_US(CONN_INTERVAL_USB_SUSPEND)) ||
 		    (info.le.latency != CONN_LATENCY_USB_SUSPEND)) {
 			return true;
 		}
-	} else if ((peer->use_llpm && (info.le.interval != CONN_INTERVAL_LLPM_REG)) ||
-		   (!peer->use_llpm && (info.le.interval != CONN_INTERVAL_BLE_REG)) ||
+	} else if ((peer->use_llpm && (interval_us != CONN_INTERVAL_LLPM_US)) ||
+		   (!peer->use_llpm && (interval_us != CONN_INTERVAL_BLE_US)) ||
 		   (info.le.latency != peer->requested_latency)) {
 		return true;
 	}
diff --git a/applications/nrf_desktop/src/modules/ble_latency.c b/applications/nrf_desktop/src/modules/ble_latency.c
@@ -102,8 +102,9 @@ static void set_conn_latency(bool low_latency)
 	/* Request with connection interval set to a LLPM value is rejected
 	 * by Zephyr Bluetooth API.
 	 */
-	uint16_t interval = (info.le.interval & REG_CONN_INTERVAL_LLPM_MASK) ?
-			  REG_CONN_INTERVAL_BLE_DEFAULT : info.le.interval;
+	uint16_t info_interval_1250us = BT_GAP_US_TO_CONN_INTERVAL(info.le.interval_us);
+	uint16_t interval = (info_interval_1250us & REG_CONN_INTERVAL_LLPM_MASK) ?
+			 REG_CONN_INTERVAL_BLE_DEFAULT : info_interval_1250us;
 	const struct bt_le_conn_param param = {
 		.interval_min = interval,
 		.interval_max = interval,
diff --git a/samples/bluetooth/conn_time_sync/src/peripheral.c b/samples/bluetooth/conn_time_sync/src/peripheral.c
@@ -30,7 +30,7 @@ static uint32_t conn_interval_us_get(const struct bt_conn *conn)
 		return 0;
 	}
 
-	return BT_CONN_INTERVAL_TO_US(info.le.interval);
+	return info.le.interval_us;
 }
 
 static ssize_t time_sync_data_received(struct bt_conn *conn,
diff --git a/samples/bluetooth/llpm/src/main.c b/samples/bluetooth/llpm/src/main.c
@@ -201,7 +201,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 
 	printk("Connected as %s\n",
 	       conn_info.role == BT_CONN_ROLE_CENTRAL ? "central" : "peripheral");
-	__ASSERT_NO_MSG(conn_info.le.interval == INTERVAL_LLPM);
+	__ASSERT_NO_MSG(conn_info.le.interval_us == INTERVAL_LLPM * BT_HCI_LE_INTERVAL_UNIT_US);
 	printk("Conn. interval is 1 ms\n");
 }
 
diff --git a/samples/bluetooth/radio_notification_cb/src/main.c b/samples/bluetooth/radio_notification_cb/src/main.c
@@ -81,7 +81,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 		return;
 	}
 
-	conn_interval_us = BT_CONN_INTERVAL_TO_US(info.le.interval);
+	conn_interval_us = info.le.interval_us;
 
 	/*Start service discovery when link is encrypted*/
 	err = bt_gatt_dm_start(conn, BT_UUID_LATENCY, &discovery_cb,
diff --git a/samples/bluetooth/throughput/src/main.c b/samples/bluetooth/throughput/src/main.c
@@ -199,7 +199,7 @@ static void connected(struct bt_conn *conn, uint8_t hci_err)
 
 	printk("Connected as %s\n",
 	       info.role == BT_CONN_ROLE_CENTRAL ? "central" : "peripheral");
-	printk("Conn. interval is %u units\n", info.le.interval);
+	printk("Conn. interval is %u us\n", info.le.interval_us);
 
 	if (info.role == BT_CONN_ROLE_PERIPHERAL) {
 		err = bt_conn_set_security(conn, BT_SECURITY_L2);
@@ -497,7 +497,7 @@ static int connection_configuration_set(const struct shell *shell,
 		return err;
 	}
 
-	if (info.le.interval != conn_param->interval_max) {
+	if (BT_GAP_US_TO_CONN_INTERVAL(info.le.interval_us) != conn_param->interval_max) {
 		err = bt_conn_le_param_update(default_conn, conn_param);
 		if (err) {
 			shell_error(shell,
diff --git a/samples/wifi/ble_coex/src/bt_throughput_test.c b/samples/wifi/ble_coex/src/bt_throughput_test.c
@@ -207,7 +207,7 @@ static void connected(struct bt_conn *conn, uint8_t hci_err)
 	}
 
 	LOG_INF("Connected as %s", info.role == BT_CONN_ROLE_CENTRAL ? "central" : "peripheral");
-	LOG_INF("Conn. interval is %u units", info.le.interval);
+	LOG_INF("Conn. interval is %u us", info.le.interval_us);
 
 	if (info.role == BT_CONN_ROLE_CENTRAL) {
 		err = bt_gatt_dm_start(default_conn,
@@ -475,7 +475,7 @@ int connection_configuration_set(const struct bt_le_conn_param *conn_param,
 		}
 	}
 
-	if (info.le.interval != conn_param->interval_max) {
+	if (BT_GAP_US_TO_CONN_INTERVAL(info.le.interval_us) != conn_param->interval_max) {
 		err = bt_conn_le_param_update(default_conn, conn_param);
 		if (err) {
 			LOG_ERR("Connection parameters update failed: %d", err);
diff --git a/subsys/bluetooth/host_extensions/radio_notification_conn_cb.c b/subsys/bluetooth/host_extensions/radio_notification_conn_cb.c
@@ -34,7 +34,7 @@ static uint32_t conn_interval_us_get(const struct bt_conn *conn)
 		return 0;
 	}
 
-	return BT_CONN_INTERVAL_TO_US(info.le.interval);
+	return info.le.interval_us;
 }
 
 static void work_handler(struct k_work *work)
diff --git a/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c b/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c
@@ -279,7 +279,10 @@ static void bt_conn_info_dec(struct nrf_rpc_cbor_ctx *ctx, struct bt_conn *conn,
 	info->id = nrf_rpc_decode_uint(ctx);
 
 	if (info->type == BT_CONN_TYPE_LE) {
-		info->le.interval = nrf_rpc_decode_uint(ctx);
+		info->le.interval_us = nrf_rpc_decode_uint(ctx);
+#if !defined(CONFIG_BT_SHORTER_CONNECTION_INTERVALS)
+		info->le._interval = nrf_rpc_decode_uint(ctx);
+#endif
 		info->le.latency = nrf_rpc_decode_uint(ctx);
 		info->le.timeout = nrf_rpc_decode_uint(ctx);
 		LOCK_CONN_INFO();
diff --git a/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c b/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c
@@ -246,7 +246,10 @@ static const size_t bt_conn_info_buf_size =
 	1 + BT_RPC_SIZE_OF_FIELD(struct bt_conn_info, type) +
 	1 + BT_RPC_SIZE_OF_FIELD(struct bt_conn_info, role) +
 	1 + BT_RPC_SIZE_OF_FIELD(struct bt_conn_info, id) +
-	1 + BT_RPC_SIZE_OF_FIELD(struct bt_conn_info, le.interval) +
+	1 + BT_RPC_SIZE_OF_FIELD(struct bt_conn_info, le.interval_us) +
+#if !defined(CONFIG_BT_SHORTER_CONNECTION_INTERVALS)
+	1 + BT_RPC_SIZE_OF_FIELD(struct bt_conn_info, le._interval) +
+#endif
 	1 + BT_RPC_SIZE_OF_FIELD(struct bt_conn_info, le.latency) +
 	1 + BT_RPC_SIZE_OF_FIELD(struct bt_conn_info, le.timeout) +
 	4 * (1 + sizeof(bt_addr_le_t)) +
@@ -269,7 +272,10 @@ static void bt_conn_info_enc(struct nrf_rpc_cbor_ctx *encoder, struct bt_conn_in
 	nrf_rpc_encode_uint(encoder, info->id);
 
 	if (info->type == BT_CONN_TYPE_LE) {
-		nrf_rpc_encode_uint(encoder, info->le.interval);
+		nrf_rpc_encode_uint(encoder, info->le.interval_us);
+#if !defined(CONFIG_BT_SHORTER_CONNECTION_INTERVALS)
+		nrf_rpc_encode_uint(encoder, info->le._interval);
+#endif
 		nrf_rpc_encode_uint(encoder, info->le.latency);
 		nrf_rpc_encode_uint(encoder, info->le.timeout);
 		nrf_rpc_encode_buffer(encoder, info->le.src, sizeof(bt_addr_le_t));
diff --git a/subsys/caf/modules/ble_state.c b/subsys/caf/modules/ble_state.c
@@ -69,10 +69,11 @@ static void broadcast_init_conn_params(struct bt_conn *conn)
 		LOG_ERR("Cannot get conn info (%d)", err);
 	} else {
 		struct ble_peer_conn_params_event *event = new_ble_peer_conn_params_event();
+		uint16_t info_interval_1250us = BT_GAP_US_TO_CONN_INTERVAL(info.le.interval_us);
 
 		event->id = conn;
-		event->interval_min = info.le.interval;
-		event->interval_max = info.le.interval;
+		event->interval_min = info_interval_1250us;
+		event->interval_max = info_interval_1250us;
 		event->latency = info.le.latency;
 		event->timeout = info.le.timeout;
 		event->updated = true;

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ static void le_audio_msg_sub_thread(void)`
`288`	`288`	`if (ret) {`
`289`	`289`	`LOG_ERR("Failed to get conn info");`
`290`	`290`	`} else {`
`291`		`- interval = conn_info.le.interval;`
	`291`	`+ interval = BT_GAP_US_TO_CONN_INTERVAL(conn_info.le.interval_us);`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`/* Only update conn param once */`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ static uint32_t conn_interval_us_get(const struct bt_conn *conn)`
`30`	`30`	`return 0;`
`31`	`31`	`}`
`32`	`32`
`33`		`- return BT_CONN_INTERVAL_TO_US(info.le.interval);`
	`33`	`+ return info.le.interval_us;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`static ssize_t time_sync_data_received(struct bt_conn *conn,`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ static void connected(struct bt_conn *conn, uint8_t err)`
`201`	`201`
`202`	`202`	`printk("Connected as %s\n",`
`203`	`203`	`conn_info.role == BT_CONN_ROLE_CENTRAL ? "central" : "peripheral");`
`204`		`- __ASSERT_NO_MSG(conn_info.le.interval == INTERVAL_LLPM);`
	`204`	`+ __ASSERT_NO_MSG(conn_info.le.interval_us == INTERVAL_LLPM * BT_HCI_LE_INTERVAL_UNIT_US);`
`205`	`205`	`printk("Conn. interval is 1 ms\n");`
`206`	`206`	`}`
`207`	`207`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)`
`81`	`81`	`return;`
`82`	`82`	`}`
`83`	`83`
`84`		`- conn_interval_us = BT_CONN_INTERVAL_TO_US(info.le.interval);`
	`84`	`+ conn_interval_us = info.le.interval_us;`
`85`	`85`
`86`	`86`	`/Start service discovery when link is encrypted/`
`87`	`87`	`err = bt_gatt_dm_start(conn, BT_UUID_LATENCY, &discovery_cb,`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ static void connected(struct bt_conn *conn, uint8_t hci_err)`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`LOG_INF("Connected as %s", info.role == BT_CONN_ROLE_CENTRAL ? "central" : "peripheral");`
`210`		`- LOG_INF("Conn. interval is %u units", info.le.interval);`
	`210`	`+ LOG_INF("Conn. interval is %u us", info.le.interval_us);`
`211`	`211`
`212`	`212`	`if (info.role == BT_CONN_ROLE_CENTRAL) {`
`213`	`213`	`err = bt_gatt_dm_start(default_conn,`
`@@ -475,7 +475,7 @@ int connection_configuration_set(const struct bt_le_conn_param *conn_param,`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`
`478`		`- if (info.le.interval != conn_param->interval_max) {`
	`478`	`+ if (BT_GAP_US_TO_CONN_INTERVAL(info.le.interval_us) != conn_param->interval_max) {`
`479`	`479`	`err = bt_conn_le_param_update(default_conn, conn_param);`
`480`	`480`	`if (err) {`
`481`	`481`	`LOG_ERR("Connection parameters update failed: %d", err);`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ static uint32_t conn_interval_us_get(const struct bt_conn *conn)`
`34`	`34`	`return 0;`
`35`	`35`	`}`
`36`	`36`
`37`		`- return BT_CONN_INTERVAL_TO_US(info.le.interval);`
	`37`	`+ return info.le.interval_us;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`static void work_handler(struct k_work *work)`