bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Rename BLE to Bluetooth (LE) where applicable

Browse Source 
The BLE acronym is not an official description of Bluetooth
LE, and the Bluetooth SIG only ever refers to it as Bluetooth
Low Energy or Bluetooth LE, so Zephyr should as well.

This commit does not change any board or vendor specific
documentation, and the term BLE may still be used in those.
It will be up to the vendors to update it if they want,
since many of them are using the term BLE in their
products.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2025-02-10 08:47:45 +01:00 committed by Benjamin Cabé
parent 3b6a15a24d
commit 571f26cf1a
23 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/bluetooth/hci/spi.c
View File

@ -377,7 +377,7 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)
struct bt_spi_data *hci = dev->data;
int err;
/* Configure RST pin and hold BLE in Reset */
/* Configure RST pin and hold Bluetooth LE in Reset */
err = gpio_pin_configure_dt(&rst_gpio, GPIO_OUTPUT_ACTIVE);
if (err) {
return err;
@ -403,7 +403,7 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)
hci->recv = recv;
/* Take BLE out of reset */
/* Take Bluetooth LE out of reset */
k_sleep(K_MSEC(DT_INST_PROP_OR(0, reset_assert_duration_ms, 0)));
gpio_pin_set_dt(&rst_gpio, 0);

2
drivers/flash/Kconfig.nrf
View File

@ -37,7 +37,7 @@ config SOC_FLASH_NRF_RADIO_SYNC_TICKER
depends on BT_LL_SW_SPLIT
help
Enable synchronization between flash memory driver and radio using
BLE LL controller ticker API.
Bluetooth LE LL controller ticker API.
config SOC_FLASH_NRF_RADIO_SYNC_NONE
bool "none"

2
drivers/flash/Kconfig.nrf_rram
View File

@ -50,7 +50,7 @@ config SOC_FLASH_NRF_RADIO_SYNC_TICKER
depends on BT_LL_SW_SPLIT
help
Enable synchronization between flash memory driver and radio using
BLE LL controller ticker API.
Bluetooth LE LL controller ticker API.
config SOC_FLASH_NRF_RADIO_SYNC_NONE
bool "none"

2
drivers/hwinfo/hwinfo_nrf.c
View File

@ -41,7 +41,7 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
buf[1] = nrf_ficr_deviceid_get(NRF_FICR, 1);
#endif
#elif NRF_FICR_HAS_DEVICE_ADDR || NRF_FICR_HAS_BLE_ADDR
/* DEVICEID is not accessible, use device/ble address instead.
/* DEVICEID is not accessible, use device/Bluetooth LE address instead.
* Assume that it is always accessible from the non-secure image.
*/
buf[0] = nrf_ficr_deviceaddr_get(NRF_FICR, 0);

2
include/zephyr/bluetooth/hci_types.h
View File

@ -1028,7 +1028,7 @@ struct bt_hci_rp_read_encryption_key_size {
uint8_t key_size;
} __packed;
/* BLE */
/* Bluetooth LE */
#define BT_HCI_OP_LE_SET_EVENT_MASK BT_OP(BT_OGF_LE, 0x0001) /* 0x2001 */
struct bt_hci_cp_le_set_event_mask {

4
include/zephyr/bluetooth/mesh/statistic.h
View File

@ -1,5 +1,5 @@
/** @file
* @brief BLE mesh statistic APIs.
* @brief Bluetooth Mesh statistic APIs.
*/
/*
@ -51,7 +51,7 @@ struct bt_mesh_statistic {
/** @brief Get mesh frame handling statistic.
*
* @param st BLE mesh statistic.
* @param st Bluetooh Mesh statistic.
*/
void bt_mesh_stat_get(struct bt_mesh_statistic *st);

10
include/zephyr/logging/log_backend_ble.h
View File

@ -9,7 +9,7 @@
#include <stdbool.h>
/**
* @brief Raw adv UUID data to add the ble backend for the use with apps
* @brief Raw adv UUID data to add the Bluetooth backend for the use with apps
* such as the NRF Toolbox
*
*/
@ -19,7 +19,7 @@
0x6E
/**
* @brief Hook for application to know when the ble backend
* @brief Hook for application to know when the Bluetooth backend
* is enabled or disabled.
* @param backend_status True if the backend is enabled or false if disabled
* @param ctx User context
@ -28,10 +28,10 @@
typedef void (*logger_backend_ble_hook)(bool backend_status, void *ctx);
/**
* @brief Allows application to add a hook for the status of the BLE
* @brief Allows application to add a hook for the status of the Bluetooth
* logger backend.
* @details The BLE logger backend is enabled or disabled auomatically by
* the subscription of the notification characteristic of this BLE
* @details The Bluetooth logger backend is enabled or disabled auomatically by
* the subscription of the notification characteristic of this Bluetooth
* Logger backend service.
*
* @param hook The hook that will be called when the status of the backend changes

6
include/zephyr/mgmt/mcumgr/transport/smp.h
View File

@ -42,7 +42,7 @@ typedef int (*smp_transport_out_fn)(struct net_buf *nb);
* The supplied net_buf should contain a request received from the peer whose
* MTU is being queried. This function takes a net_buf parameter because some
* transports store connection-specific information in the net_buf user header
* (e.g., the BLE transport stores the peer address).
* (e.g., the Bluetooth transport stores the peer address).
*
* @param nb Contains a request from the relevant peer.
*
@ -55,7 +55,7 @@ typedef uint16_t (*smp_transport_get_mtu_fn)(const struct net_buf *nb);
* @brief SMP copy user_data callback
*
* The supplied src net_buf should contain a user_data that cannot be copied
* using regular memcpy function (e.g., the BLE transport net_buf user_data
* using regular memcpy function (e.g., the Bluetooth transport net_buf user_data
* stores the connection reference that has to be incremented when is going
* to be used by another buffer).
*
@ -71,7 +71,7 @@ typedef int (*smp_transport_ud_copy_fn)(struct net_buf *dst,
* @brief SMP free user_data callback
*
* This function frees net_buf user data, because some transports store
* connection-specific information in the net_buf user data (e.g., the BLE
* connection-specific information in the net_buf user data (e.g., the Bluetooth
* transport stores the connection reference that has to be decreased).
*
* @param ud Contains a user_data pointer to be freed.

14
subsys/bluetooth/controller/Kconfig
View File

@ -143,12 +143,12 @@ config BT_CTLR
the HAS_BT_CTLR option.
config BT_LL_SW_SPLIT
bool "Software-based BLE Link Layer"
bool "Software-based Bluetooth LE Link Layer"
default y
depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED
select HAS_BT_CTLR
help
Use Zephyr software BLE Link Layer ULL LLL split implementation.
Use Zephyr software Bluetooth LE Link Layer ULL LLL split implementation.
config BT_CTLR_HCI
bool "Host Controller Interface (HCI)"
@ -161,7 +161,7 @@ config BT_CTLR_HCI
if HAS_BT_CTLR
comment "BLE Controller configuration"
comment "Bluetooth Controller configuration"
config BT_CTLR_ENTROPY
bool "Random number generation in Controller"
@ -216,7 +216,7 @@ config BT_CTLR_DUP_FILTER_LEN
depends on BT_LL_SW_SPLIT
default 16
help
Set the number of unique BLE addresses that can be filtered as
Set the number of unique Bluetooth LE addresses that can be filtered as
duplicates while scanning.
config BT_CTLR_DUP_FILTER_ADV_SET_MAX
@ -322,7 +322,7 @@ choice BT_CTLR_TX_PWR
default BT_CTLR_TX_PWR_0
depends on BT_CTLR_TX_PWR_ANTENNA = 0 || BT_LL_SW_SPLIT
help
Select a supported BLE Radio transmit power level in dBm.
Select a supported Bluetooth LE Radio transmit power level in dBm.
Only values supported natively by the SoC are available.
The value set here represents the actual default power level fed
to the antenna.
@ -539,7 +539,7 @@ config BT_CTLR_TX_PWR_DYNAMIC_CONTROL
Provides HCI VS commands to set and get the current Tx
power on an individual role/connection basis.
comment "BLE Controller features"
comment "Bluetooth Controller features"
if BT_CONN
@ -1164,6 +1164,6 @@ config BT_CTLR_DEBUG_PINS_CPUAPP
bool "Bluetooth Controller Debug Pins"
depends on BOARD_NRF5340DK_NRF5340_CPUAPP
help
Route debug GPIO toggling for the BLE Controller. Enable this when
Route debug GPIO toggling for the Bluetooth Controller. Enable this when
using Bluetooth Controller Debug Pins in co-processor and the main
processor needs to setup and/or route the signals.

10
subsys/bluetooth/controller/Kconfig.ll_sw_split
View File

@ -95,7 +95,7 @@ config BT_LLL_VENDOR_OPENISA
Use OpenISA Lower Link Layer implementation.
# BT_CTLR_DF_SUPPORT is a wrapper for all DF features. Here we select features that are supported by
# Zephyr's BLE Controller.
# Zephyr's Bluetooth LE Controller.
config BT_CTLR_DF_SUPPORT
depends on BT_LL_SW_SPLIT && !BT_CTLR_TIFS_HW
select BT_CTLR_DF_CTE_TX_SUPPORT
@ -973,11 +973,11 @@ config BT_CTLR_SW_SWITCH_SINGLE_TIMER
SOC_COMPATIBLE_NRF54LX)
help
Implement the tIFS Trx SW switch with the same TIMER
instance, as the one used for BLE event timing. Requires
instance, as the one used for Bluetooth event timing. Requires
SW switching be enabled. Using a single TIMER:
(+) frees up one TIMER instance
(+) removes jitter for HCTO implementation
(-) introduces drifting to the absolute time inside BLE
(-) introduces drifting to the absolute time inside Bluetooth
events, that increases linearly with the number of
packets exchanged in the event
(-) makes it impossible to use most of the pre-programmed
@ -1413,7 +1413,7 @@ endchoice
source "subsys/bluetooth/controller/coex/Kconfig"
comment "BLE Controller debug configuration"
comment "Bluetooth LE Controller debug configuration"
config BT_CTLR_PROFILE_ISR
bool "Profile radio ISR"
@ -1427,7 +1427,7 @@ config BT_CTLR_DEBUG_PINS
bool "Bluetooth Controller Debug Pins"
depends on BOARD_NRF51DK_NRF51822 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52DK_NRF52810 || BOARD_NRF52840DK_NRF52840 || BOARD_NRF52833DK_NRF52833 || BOARD_NRF5340DK_NRF5340_CPUNET || BOARD_RV32M1_VEGA
help
Turn on debug GPIO toggling for the BLE Controller. This is useful
Turn on debug GPIO toggling for the Bluetooth LE Controller. This is useful
when debugging with a logic analyzer or profiling certain sections of
the code.

4
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
View File

@ -2098,7 +2098,7 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
CCM_MODE_MODE_Msk;
#if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
/* Enable CCM Protocol Mode BLE */
/* Enable CCM Protocol Mode Bluetooth LE */
mode |= (CCM_MODE_PROTOCOL_Ble << CCM_MODE_PROTOCOL_Pos) &
CCM_MODE_PROTOCOL_Msk;
@ -2342,7 +2342,7 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
CCM_MODE_DATARATE_Msk;
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
/* Enable CCM Protocol Mode BLE */
/* Enable CCM Protocol Mode Bluetooth LE */
mode |= (CCM_MODE_PROTOCOL_Ble << CCM_MODE_PROTOCOL_Pos) &
CCM_MODE_PROTOCOL_Msk;

2
subsys/bluetooth/host/Kconfig
View File

@ -287,7 +287,7 @@ config BT_FILTER_ACCEPT_LIST
bool "Filter accept list support"
help
This option enables the filter accept list API. This takes advantage of the
filtering feature of a BLE controller.
filtering feature of a Bluetooth LE controller.
The filter accept list is a global list and the same list is used
by both scanner and advertiser. The filter accept list cannot be modified while
it is in use.

2
subsys/bluetooth/host/uuid.c
View File

@ -15,7 +15,7 @@
#define UUID_16_BASE_OFFSET 12
/* TODO: Decide whether to continue using BLE format or switch to RFC 4122 */
/* TODO: Decide whether to continue using Bluetooth LE format or switch to RFC 4122 */
/* Base UUID : 0000[0000]-0000-1000-8000-00805F9B34FB
* 0x2800 : 0000[2800]-0000-1000-8000-00805F9B34FB

8
subsys/bluetooth/mesh/Kconfig
View File

@ -1536,14 +1536,14 @@ endchoice
if BT_MESH_USES_MBEDTLS_PSA || BT_MESH_USES_TFM_PSA
config BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET
int "Offset of BLE Mesh key id range regarding PSA_KEY_ID_USER_MIN"
int "Offset of Bluetooth Mesh key id range regarding PSA_KEY_ID_USER_MIN"
default 0
help
The PSA specification mandates to set key identifiers for keys
with persistent lifetime. The users of the PSA API is responsible
(BLE Mesh is user of PSA API) to provide correct and unique identifiers.
The BLE Mesh identifier range should be between PSA_KEY_ID_USER_MIN and
PSA_KEY_ID_USER_MAX. BLE Mesh requires two ids for each subnetwork, two ids
(Bluetooth Mesh is user of PSA API) to provide correct and unique identifiers.
The Bluetooth Mesh identifier range should be between PSA_KEY_ID_USER_MIN and
PSA_KEY_ID_USER_MAX. Bluetooth Mesh requires two ids for each subnetwork, two ids
for each application key, and two ids for the device key and device key candidate.
It should consider the Mesh Configuration Database instances if database enabled.

10
subsys/bluetooth/mesh/crypto_psa.c
View File

@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(bt_mesh_crypto_psa);
CONFIG_BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET)
BUILD_ASSERT(BT_MESH_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE <= PSA_KEY_ID_USER_MAX,
"BLE Mesh PSA key id range overlaps maximum allowed boundary.");
"Bluetooth Mesh PSA key id range overlaps maximum allowed boundary.");
BUILD_ASSERT(PSA_MAC_LENGTH(PSA_KEY_TYPE_AES, 128, PSA_ALG_CMAC) == 16,
"MAC length should be 16 bytes for 128-bits key for CMAC-AES");
@ -286,12 +286,12 @@ const uint8_t *bt_mesh_pub_key_get(void)
return dh_pair.is_ready ? dh_pair.public_key_be + 1 : NULL;
}
BUILD_ASSERT(PSA_RAW_KEY_AGREEMENT_OUTPUT_SIZE(
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1), 256) == DH_KEY_SIZE,
"Diffie-Hellman shared secret size should be the same in PSA and BLE Mesh");
BUILD_ASSERT(PSA_RAW_KEY_AGREEMENT_OUTPUT_SIZE(PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1),
256) == DH_KEY_SIZE,
"Diffie-Hellman shared secret size should be the same in PSA and Bluetooth Mesh");
BUILD_ASSERT(PSA_KEY_EXPORT_ECC_PUBLIC_KEY_MAX_SIZE(256) == PUB_KEY_SIZE + 1,
"Exported PSA public key should be 1 byte larger than BLE Mesh public key");
"Exported PSA public key should be 1 byte larger than Bluetooth Mesh public key");
int bt_mesh_dhkey_gen(const uint8_t *pub_key, const uint8_t *priv_key, uint8_t *dhkey)
{

2
subsys/bluetooth/services/ots/ots_l2cap.c
View File

@ -28,7 +28,7 @@ LOG_MODULE_DECLARE(bt_ots, CONFIG_BT_OTS_LOG_LEVEL);
LOG_MODULE_REGISTER(bt_ots, CONFIG_BT_OTS_CLIENT_LOG_LEVEL);
#endif
/* According to BLE specification Assigned Numbers that are used in the
/* According to Bluetooth specification Assigned Numbers that are used in the
* Logical Link Control for protocol/service multiplexers.
*/
#define BT_GATT_OTS_L2CAP_PSM 0x0025

2
subsys/logging/backends/Kconfig.ble
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
config LOG_BACKEND_BLE
bool "Bluetooth Low Energy (BLE) backend"
bool "Bluetooth Low Energy (LE) backend"
depends on BT
depends on LOG_PROCESS_THREAD_STACK_SIZE>=2048
select EXPERIMENTAL

8
subsys/logging/backends/log_backend_ble.c
View File

@ -27,7 +27,7 @@ static void log_backend_ble_connect(struct bt_conn *conn, uint8_t err);
static void log_backend_ble_disconnect(struct bt_conn *conn, uint8_t reason);
/**
* @brief Callback for the subscription to the ble logger notification characteristic
* @brief Callback for the subscription to the Bluetooth logger notification characteristic
* @details This callback enables/disables automatically the logger when the notification
* is subscribed.
* @param attr The attribute that's changed value
@ -35,7 +35,7 @@ static void log_backend_ble_disconnect(struct bt_conn *conn, uint8_t reason);
*/
static void log_notify_changed(const struct bt_gatt_attr *attr, uint16_t value);
/** BLE Logger based on the UUIDs for the NRF Connect SDK NUS service
/** Bluetooth Logger based on the UUIDs for the NRF Connect SDK NUS service
* https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.3.0/nrf/libraries/bluetooth_services/services/nus.html
*/
#define NUS_SERVICE_UUID \
@ -55,7 +55,7 @@ BT_CONN_CB_DEFINE(log_backend_ble) = {
};
/**
* @brief BLE Service that represents this backend
* @brief Bluetooth Service that represents this backend
* @note Only transmission characteristic is used. The RX characteristic
* is added to make the backend usable with the NRF toolbox app
* which expects both characteristics.
@ -175,7 +175,7 @@ static void panic(struct log_backend const *const backend)
}
/**
* @brief Backend ready function for ble logger
* @brief Backend ready function for Bluetooth logger
* @details After initialization of the logger, this function avoids
* the logger subys to enable it. The logger is enabled automatically
* via the notification changed callback.

2
tests/bluetooth/df/connectionless_cte_chains/CMakeLists.txt
View File

@ -12,7 +12,7 @@ SET(common_sources ${CMAKE_CURRENT_SOURCE_DIR}/../common/src/radio_df_stub.c)
target_sources(app PRIVATE ${common_sources} ${app_sources})
# Include paths to allow access to functions implemented in BLE controller
# Include paths to allow access to functions implemented in Bluetooth LE controller
target_include_directories(app PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../common/include)
target_include_directories(app PRIVATE

2
tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv.sh
View File

@ -4,7 +4,7 @@
# Extended advertising test:
#
# - Broadcasting Only: a BLE broadcaster advertises with extended
# - Broadcasting Only: a Bluetooth LE broadcaster advertises with extended
# advertising, and a scanner scans the extended advertisement packets.
source ${ZEPHYR_BASE}/tests/bsim/sh_common.source

4
tests/bsim/bluetooth/ll/edtt/README.txt
View File

@ -1,14 +1,14 @@
Intro
#####
This is the embedded side of the BLE conformance tests which are part of the
This is the embedded side of the Bluetooth conformance tests which are part of the
EDTT (Embedded Device Test Tool).
Much more info about the tool can be found in https://github.com/EDTTool/EDTT
and in its `doc/` folder.
In very short, there is 2 applications in this folder:
1.) A controller only build of the BLE stack, where the HCI, and a few extra
1.) A controller only build of the Bluetooth LE stack, where the HCI, and a few extra
interfaces are exposed to the EDTT.
2.) An application which implements the test GATT services specified by BT SIG
in GATT_Test_Databases.xlsm, with an EDTT interface which allows the EDTT

2
tests/bsim/bluetooth/mesh/src/main.c
View File

@ -96,7 +96,7 @@ int main(void)
k_thread_create(&bsim_mesh_thread, bsim_mesh_thread_stack,
K_KERNEL_STACK_SIZEOF(bsim_mesh_thread_stack), bsim_mesh_entry_point, NULL,
NULL, NULL, K_PRIO_COOP(1), 0, K_NO_WAIT);
k_thread_name_set(&bsim_mesh_thread, "BabbleSim BLE Mesh tests");
k_thread_name_set(&bsim_mesh_thread, "BabbleSim Bluetooth Mesh tests");
return 0;
}

2
tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
View File

@ -7,7 +7,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# The test checks that both advertisers, the legacy and the extended, behave identically.
# In particular:
# - `bt_mesh_send_cb.end` callback with error code `0` is called for the advertisement that the
# advertiser already pushed to the ble host (called `bt_mesh_send_cb.start`),
# advertiser already pushed to the Bluetooth Host (called `bt_mesh_send_cb.start`),
# - `bt_mesh_send_cb.start` callback with error `-ENODEV` is called for every advertisement that
# was pushed to the mesh advertiser using `bt_mesh_adv_send` function,
# - `bt_mesh_adv_create` returns NULL when attempting to create a new advertisement while the stack