Bluetooth: Seperate BT_ISO and BT_AUDIO

ISO is a building block for BT_AUDIO but it is not only
useful for AUDIO, and as such should be possible to
enable without enabling BT_AUDIO.

This commit moves iso.c and iso_internal.h to the
host directory (from host/audio) and removes
the CMakeLists.txt.

The /audio directory is left intact for the Kconfig options
it provides, and as a directory for future BLE Audio
content.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-01-20 14:11:01 +01:00 committed by Anas Nashif
commit c6132c8fdb
9 changed files with 10 additions and 12 deletions

View file

@ -225,6 +225,7 @@ endif # BT_CONN
config BT_ISO
bool "Bluetooth Isochronous Channel Support [EXPERIMENTAL]"
depends on BT_CONN
help
Select this to enable Isochronous Channel support.

View file

@ -60,6 +60,11 @@ if(CONFIG_BT_HCI_HOST)
endif()
endif()
zephyr_library_sources_ifdef(
CONFIG_BT_ISO
iso.c
)
if(CONFIG_BT_DF)
zephyr_library_sources(
direction.c
@ -101,5 +106,3 @@ if(CONFIG_BT_CONN_DISABLE_SECURITY)
Do not use in production."
)
endif()
add_subdirectory_ifdef(CONFIG_BT_AUDIO audio)

View file

@ -1,6 +0,0 @@
# SPDX-License-Identifier: Apache-2.0
zephyr_library()
zephyr_library_link_libraries(subsys__bluetooth)
zephyr_library_sources_ifdef(CONFIG_BT_ISO iso.c)

View file

@ -10,7 +10,7 @@
#include "hci_core.h"
#include "conn_internal.h"
#include "audio/iso_internal.h"
#include "iso_internal.h"
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
#define LOG_MODULE_NAME bt_buf

View file

@ -35,7 +35,7 @@
#include "ssp.h"
#include "att_internal.h"
#include "gatt_internal.h"
#include "audio/iso_internal.h"
#include "iso_internal.h"
/* Peripheral timeout to initialize Connection Parameter Update procedure */
#define CONN_UPDATE_TIMEOUT K_MSEC(CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT)

View file

@ -182,7 +182,7 @@ struct bt_conn {
struct bt_conn_br br;
struct bt_conn_sco sco;
#endif
#if defined(CONFIG_BT_AUDIO)
#if defined(CONFIG_BT_ISO)
struct bt_conn_iso iso;
#endif
};

View file

@ -40,7 +40,7 @@
#include "ecc.h"
#include "conn_internal.h"
#include "audio/iso_internal.h"
#include "iso_internal.h"
#include "l2cap_internal.h"
#include "gatt_internal.h"
#include "smp.h"