From 0606bbe015e543ec51304c6c072b412f4ed5b503 Mon Sep 17 00:00:00 2001 From: Rubin Gerritsen Date: Mon, 16 Jun 2025 09:09:25 +0200 Subject: [PATCH] [nrf fromtree] Bluetooth: Decode Bluetooth 6.1 version number Bluetooth 6.1 has version number 0x0F and was released in May 2025. This commit ensures this version number is properly decoded. Going forward we may consider removing printing the version number as a string because the feature set is more important than the version number. Signed-off-by: Rubin Gerritsen (cherry picked from commit b63b993491633e699567ff0d71a3465ecfb9fa50) --- include/zephyr/bluetooth/hci_types.h | 1 + subsys/bluetooth/host/hci_core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h index 2123556b455..0b2c1b1a397 100644 --- a/include/zephyr/bluetooth/hci_types.h +++ b/include/zephyr/bluetooth/hci_types.h @@ -858,6 +858,7 @@ struct bt_hci_rp_configure_data_path { #define BT_HCI_VERSION_5_3 12 #define BT_HCI_VERSION_5_4 13 #define BT_HCI_VERSION_6_0 14 +#define BT_HCI_VERSION_6_1 15 #define BT_HCI_OP_READ_LOCAL_VERSION_INFO BT_OP(BT_OGF_INFO, 0x0001) /* 0x1001 */ struct bt_hci_rp_read_local_version_info { diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c index 3a866c6346d..7263bc39ed4 100644 --- a/subsys/bluetooth/host/hci_core.c +++ b/subsys/bluetooth/host/hci_core.c @@ -3843,7 +3843,7 @@ const char *bt_hci_get_ver_str(uint8_t core_version) { const char * const str[] = { "1.0b", "1.1", "1.2", "2.0", "2.1", "3.0", "4.0", "4.1", "4.2", - "5.0", "5.1", "5.2", "5.3", "5.4", "6.0" + "5.0", "5.1", "5.2", "5.3", "5.4", "6.0", "6.1" }; if (core_version < ARRAY_SIZE(str)) {