nrfconnect · PavelVPV · Sep 8, 2025 · Aug 15, 2025 · Jun 9, 2025 · Jun 9, 2025
diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
@@ -457,6 +457,7 @@ Bluetooth Classic:
     - MarkWangChinese
     - gzh-terry
     - makeshi
+    - chengkai15
   files:
     - doc/connectivity/bluetooth/shell/classic/a2dp.rst
     - subsys/bluetooth/common/

diff --git a/boards/96boards/carbon/Kconfig.defconfig b/boards/96boards/carbon/Kconfig.defconfig
@@ -9,6 +9,9 @@ config SPI_STM32_INTERRUPT
 	default y
 	depends on SPI
 
+configdefault MAIN_STACK_SIZE
+	default 1600 if MBEDTLS_INIT
+
 endif # BOARD_96B_CARBON_STM32F401XE
 
 if BOARD_96B_CARBON_NRF51822

diff --git a/doc/connectivity/bluetooth/api/a2dp.rst b/doc/connectivity/bluetooth/api/a2dp.rst
@@ -0,0 +1,10 @@
+.. _bt_a2dp:
+
+Advanced Audio Distribution Profile (A2DP)
+###########################################
+
+
+API Reference
+*************
+
+.. doxygengroup:: bt_a2dp
diff --git a/doc/connectivity/bluetooth/api/audio/bluetooth-le-audio-arch.rst b/doc/connectivity/bluetooth/api/audio/bluetooth-le-audio-arch.rst
@@ -778,10 +778,10 @@ Bluetooth Audio Stack.
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Commander                     |         |                  | - WIP                 | - Feature complete                               |
-   |        |                               |         |                  |                       | - Shell Module                                   |
-   |        |                               |         |                  |                       | - BSIM test                                      |
-   |        |                               |         |                  |                       | - Sample Application                             |
+   |        | Commander                     |         |                  | - Feature complete    | - Shell Module                                   |
+   |        |                               |         |                  | - BSIM test           | - Sample Application                             |
+   |        |                               |         |                  |                       |                                                  |
+   |        |                               |         |                  |                       |                                                  |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
    | HAP    | Hearing Aid                   | 1.0.0   | 3.1              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |

diff --git a/doc/connectivity/bluetooth/api/index.rst b/doc/connectivity/bluetooth/api/index.rst
@@ -12,6 +12,7 @@ Bluetooth Classic Host and profiles
    hfp.rst
    rfcomm.rst
    sdp.rst
+   a2dp.rst
 
 Bluetooth LE Audio
 ==================

diff --git a/doc/connectivity/bluetooth/api/l2cap.rst b/doc/connectivity/bluetooth/api/l2cap.rst
@@ -3,11 +3,45 @@
 Logical Link Control and Adaptation Protocol (L2CAP)
 ####################################################
 
-L2CAP layer enables connection-oriented channels which can be enable with the
-configuration option: :kconfig:option:`CONFIG_BT_L2CAP_DYNAMIC_CHANNEL`. This channels
+L2CAP layer enables connection-oriented channels which can be enabled with the
+configuration option: :kconfig:option:`CONFIG_BT_L2CAP_DYNAMIC_CHANNEL`. These channels
 support segmentation and reassembly transparently, they also support credit
 based flow control making it suitable for data streams.
 
+The user can also define fixed channels using the :c:macro:`BT_L2CAP_FIXED_CHANNEL_DEFINE`
+macro. Fixed channels are initialized upon connection, and do not support segmentation. An example
+of how to define a fixed channel is shown below.
+
+.. code-block:: c
+
+   static struct bt_l2cap_chan fixed_chan[CONFIG_BT_MAX_CONN];
+
+   /* Callbacks are assumed to be defined prior. */
+   static struct bt_l2cap_chan_ops ops = {
+       .recv = recv_cb,
+       .sent = sent_cb,
+       .connected = connected_cb,
+       .disconnected = disconnected_cb,
+   };
+
+   static int l2cap_fixed_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan)
+   {
+       uint8_t conn_index = bt_conn_index(conn);
+
+       *chan = &fixed_chan[conn_index];
+
+       **chan = (struct bt_l2cap_chan){
+           .ops = &ops,
+       };
+
+       return 0;
+   }
+
+   BT_L2CAP_FIXED_CHANNEL_DEFINE(fixed_channel) = {
+       .cid = 0x0010,
+       .accept = l2cap_fixed_accept,
+   };
+
 Channels instances are represented by the :c:struct:`bt_l2cap_chan` struct which
 contains the callbacks in the :c:struct:`bt_l2cap_chan_ops` struct to inform
 when the channel has been connected, disconnected or when the encryption has

diff --git a/doc/connectivity/bluetooth/autopts/autopts-linux.rst b/doc/connectivity/bluetooth/autopts/autopts-linux.rst
@@ -26,36 +26,18 @@ For running with QEMU or :zephyr:board:`native_sim <native_sim>`, see :ref:`blue
 Setup Linux
 ***********
 
-Install nrftools (only required in the actual hardware test mode)
-*****************************************************************
+Please follow :ref:`getting_started` on how to setup Linux for building and flashing applications.
 
-Download latest nrftools (version >= 10.12.1) from site
-https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Command-Line-Tools/Download.
-
-.. image:: download_nrftools_linux.png
-   :height: 350
-   :width: 600
-   :align: center
-
-After you extract archive, you will see 2 .deb files, e.g.:
-
-- JLink_Linux_V688a_x86_64.deb
-
-- nRF-Command-Line-Tools_10_12_1_Linux-amd64.deb
-
-and README.md. To install the tools, double click on each .deb file or follow
-instructions from README.md.
-
-Setup Windows 10 virtual machine
-********************************
+Setup Windows 10/11 virtual machine
+***********************************
 
 Choose and install your hypervisor like VMWare Workstation(preferred) or
 VirtualBox. On VirtualBox could be some issues, if your host has fewer than 6 CPU.
 
 Create Windows virtual machine instance. Make sure it has at least 2 cores and
 installed guest extensions.
 
-Setup tested with VirtualBox 7.1.4 and VMWare Workstation 16.1.1 Pro.
+Setup tested with VirtualBox 7.2.4 and VMWare Workstation 16.1.1 Pro.
 
 Update Windows
 ==============
@@ -186,10 +168,10 @@ consoles. We will use Git Bash as Windows terminal.
    :width: 400
    :align: center
 
-Install PTS 8
-=============
+Install PTS
+===========
 
-On Windows virtual machine, install latest PTS from https://www.bluetooth.org.
+On Windows virtual machine, install the latest PTS from https://pts.bluetooth.com/download.
 Remember to install drivers from installation directory
 "C:/Program Files (x86)/Bluetooth SIG/Bluetooth PTS/PTS Driver/win64/CSRBlueCoreUSB.inf"
 
@@ -245,16 +227,6 @@ Connect devices (only required in the actual hardware test mode)
    :width: 500
    :align: center
 
-Flash board (only required in the actual hardware test mode)
-************************************************************
-
-On Linux, go to ~/zephyrproject. There should be already ~/zephyrproject/build
-directory. Flash board:
-
-.. code-block::
-
-    west flash
-
 Setup auto-pts project
 **********************
 
@@ -279,7 +251,6 @@ Install required python modules:
 .. code-block::
 
    cd auto-pts
-   pip3 install --user wheel
    pip3 install --user -r autoptsclient_requirements.txt
 
 Autopts server on Windows virtual machine
@@ -301,9 +272,14 @@ Install required python modules:
 Restart virtual machine.
 
 Running AutoPTS
-****************
+***************
+
+Please follow the information from
+https://github.com/zephyrproject-rtos/zephyr/tree/main/tests/bluetooth/tester on how to build,
+flash and run the Bluetooth Tester application.
 
-Server and client by default will run on localhost address. Run server:
+Server and client by default will run on localhost address.
+Run the server in the Windows virtual machine:
 
 .. code-block::
 
@@ -314,59 +290,89 @@ Server and client by default will run on localhost address. Run server:
    :width: 700
    :align: center
 
-Testing Zephyr Host Stack on QEMU:
+See also https://github.com/auto-pts/auto-pts for additional information on how to run auto-pts.
+
+Testing Zephyr Host Stack on hardware
+=====================================
 
 .. code-block::
 
-    # A Bluetooth controller needs to be mounted.
-    # For running with HCI UART, please visit: https://docs.zephyrproject.org/latest/samples/bluetooth/hci_uart/README.html#bluetooth-hci-uart
+    python ./autoptsclient-zephyr.py zephyr-master -t /dev/ttyACM0 -b BOARD -i SERVER_IP -l LOCAL_IP
 
-    python ./autoptsclient-zephyr.py "C:\Users\USER_NAME\Documents\Profile Tuning Suite\PTS_PROJECT\PTS_PROJECT.pqw6" \
-    	~/zephyrproject/build/zephyr/zephyr.elf -i SERVER_IP -l LOCAL_IP
+Where ``/dev/ttyACM0`` is the tty for the board,
+``BOARD`` is the board to use (e.g. ``nrf53_audio``),
+``SERVER_IP`` is the IP of the AutoPTS server,
+``LOCAL_IP`` is the local IP of the Linux machine.
 
+Testing Zephyr Host Stack on QEMU
+=================================
 
-Testing Zephyr Host Stack on :zephyr:board:`native_sim <native_sim>`:
+A Bluetooth controller needs to be mounted.
+For running with HCI UART, please visit :zephyr:code-sample:`bluetooth_hci_uart`.
 
 .. code-block::
 
-    # A Bluetooth controller needs to be mounted.
-    # For running with HCI UART, please visit: https://docs.zephyrproject.org/latest/samples/bluetooth/hci_uart/README.html#bluetooth-hci-uart
+    python ./autoptsclient-zephyr.py zephyr-master BUILD_DIR/zephyr/zephyr.elf -i SERVER_IP -l LOCAL_IP
 
-    west build -b native_sim zephyr/tests/bluetooth/tester/ -DEXTRA_CONF_FILE=overlay-native.conf
+Where ``BUILD_DIR`` is the build directory,
+``SERVER_IP`` is the IP of the AutoPTS server,
+``LOCAL_IP`` is the local IP of the Linux machine.
 
-    sudo python ./autoptsclient-zephyr.py "C:\Users\USER_NAME\Documents\Profile Tuning Suite\PTS_PROJECT\PTS_PROJECT.pqw6" \
-    	~/zephyrproject/build/zephyr/zephyr.exe -i SERVER_IP -l LOCAL_IP --hci 0
+Testing Zephyr Host Stack on :zephyr:board:`native_sim <native_sim>`
+====================================================================
 
+When tester application has been built for :zephyr:board:`native_sim <native_sim>` it produces a
+``zephyr.exe`` file, that can be run as a native Linux application.
+Depending on your system,
+you may need to perform the following steps to successfully run ``zephyr.exe``.
 
-Testing Zephyr combined (controller + host) build on nRF52:
+Setting capabilities
+--------------------
 
-.. note::
+Since the application will need access to connect to a socket for HCI,
+you may need to perform the following
 
-    If the error "ImportError: No module named pywintypes" appeared after the fresh setup,
-    uninstall and install the pywin32 module:
+.. code-block::
 
-    .. code-block::
+    setcap cap_net_raw,cap_net_admin,cap_sys_admin+ep zephyr.exe
 
-      pip install --upgrade --force-reinstall pywin32
+This is not required if you run ``zephyr.exe`` or ``./autoptsclient-zephyr.py`` with e.g. ``sudo``.
 
-Run client:
+Downing the HCI controller
+--------------------------
+
+You may also need to "down" or "power off" the HCI controller before running ``zephyr.exe``.
+This can be done either with ``hciconfig`` as
 
 .. code-block::
 
-    python ./autoptsclient-zephyr.py zephyr-master ~/zephyrproject/build/zephyr/zephyr.elf -t /dev/ACM0 \
-    	-b nrf52 -l 192.168.2.1 -i 192.168.2.2
+    hciconfig hciX down
 
-.. image:: autoptsclient_run_2.png
-   :height: 100
-   :width: 800
-   :align: center
+Where ``hciX`` is a value like ``hci0``. You may run ``hciconfig`` to get a list of your HCI devices.
 
-At the first run, when Windows asks, enable connection through firewall:
+Since ``hciconfig`` is deprecated on some systems, you may need to use
 
-.. image:: allow_firewall_2.png
-   :height: 450
-   :width: 600
-   :align: center
+.. code-block::
+
+    btmgmt -i hciX power off
+
+Similar to ``hciconfig``, ``btmgmt info`` may be used to list current controllers and their states.
+
+Both ``hciconfig`` and ``btmgmt`` may require ``sudo`` when powering down a controller.
+
+Running the client
+------------------
+
+The application can be run as
+
+.. code-block::
+
+    python ./autoptsclient-zephyr.py zephyr-master --hci HCI BUILD_DIR/zephyr/zephyr.exe -i SERVER_IP -l LOCAL_IP
+
+Where ``HCI`` is the HCI index, e.g. ``0`` or ``1``,
+``BUILD_DIR`` is the build directory,
+``SERVER_IP`` is the IP of the AutoPTS server,
+``LOCAL_IP`` is the local IP of the Linux machine.
 
 Troubleshooting
 ****************

diff --git a/doc/connectivity/bluetooth/bluetooth-shell.rst b/doc/connectivity/bluetooth/bluetooth-shell.rst
@@ -23,6 +23,10 @@ For specific Bluetooth functionality see also the following shell documentation
    shell/audio/tmap.rst
    shell/audio/pbp.rst
    shell/classic/a2dp.rst
+   shell/classic/goep.rst
+   shell/classic/hfp.rst
+   shell/classic/l2cap.rst
+   shell/classic/rfcomm.rst
    shell/host/gap.rst
    shell/host/gatt.rst
    shell/host/iso.rst

diff --git a/doc/connectivity/bluetooth/shell/audio/ccp.rst b/doc/connectivity/bluetooth/shell/audio/ccp.rst
@@ -83,3 +83,10 @@ Example Usage when connected
 
    uart:~$ ccp_call_control_client discover
    Discovery completed with GTBS and 1 TBS bearers
+
+.. code-block:: console
+
+   uart:~$ ccp_call_control_client read_bearer_name
+   Bearer 0x20046254 name: Generic TBS
+   uart:~$ ccp_call_control_client read_bearer_name 1
+   Bearer 0x20046256 name: Telephone Bearer #1