Bluetooth: Host: Move BR/EDR files to host/classic

Add subfolder "subsys/bluetooth/host/classic".
Move BR/EDR source files to the subfolder.

Signed-off-by: Lyle Zhu <lyle.zhu@nxp.com>

subsys/bluetooth/host/CMakeLists.txt

@@ -3,32 +3,16 @@
 zephyr_library()
 zephyr_library_link_libraries(subsys__bluetooth)
 
+add_subdirectory_ifdef(CONFIG_BT_CLASSIC classic)
+
 zephyr_library_sources_ifdef(CONFIG_BT_HCI_RAW          hci_raw.c hci_common.c)
 zephyr_library_sources_ifdef(CONFIG_BT_MONITOR          monitor.c)
 zephyr_library_sources_ifdef(CONFIG_BT_TINYCRYPT_ECC    hci_ecc.c)
-zephyr_library_sources_ifdef(CONFIG_BT_A2DP             a2dp.c)
-zephyr_library_sources_ifdef(CONFIG_BT_AVDTP            avdtp.c)
-zephyr_library_sources_ifdef(CONFIG_BT_RFCOMM           rfcomm.c)
 zephyr_library_sources_ifdef(CONFIG_BT_TESTING          testing.c)
 zephyr_library_sources_ifdef(CONFIG_BT_SETTINGS         settings.c)
 zephyr_library_sources_ifdef(CONFIG_BT_HOST_CCM         aes_ccm.c)
 zephyr_library_sources_ifdef(CONFIG_BT_LONG_WQ          long_wq.c)
 
-zephyr_library_sources_ifdef(
-  CONFIG_BT_BREDR
-  br.c
-  keys_br.c
-  l2cap_br.c
-  sdp.c
-  ssp.c
-  )
-
-zephyr_library_sources_ifdef(
-  CONFIG_BT_HFP_HF
-  hfp_hf.c
-  at.c
-  )
-
 if(CONFIG_BT_HCI_HOST)
   zephyr_library_sources(
     uuid.c

subsys/bluetooth/host/Kconfig

@@ -1029,6 +1029,7 @@ config BT_CONN_DISABLE_SECURITY
 config BT_BREDR
 	bool "Bluetooth BR/EDR support [EXPERIMENTAL]"
 	depends on BT_HCI_HOST
+	select BT_CLASSIC
 	select BT_PERIPHERAL
 	select BT_CENTRAL
 	select BT_SMP
@@ -1037,6 +1038,13 @@ config BT_BREDR
 	help
 	  This option enables Bluetooth BR/EDR support
 
+config BT_CLASSIC
+	bool "Bluetooth classic(BR/EDR) support [EXPERIMENTAL]"
+	depends on BT_BREDR
+	select EXPERIMENTAL
+	help
+	  This option enables Bluetooth classic(BR/EDR) support
+
 if BT_BREDR
 config BT_MAX_SCO_CONN
 	int "Maximum number of simultaneous SCO connections"

subsys/bluetooth/host/classic/CMakeLists.txt

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_link_libraries(subsys__bluetooth)
+
+zephyr_library_sources_ifdef(CONFIG_BT_A2DP             a2dp.c)
+zephyr_library_sources_ifdef(CONFIG_BT_AVDTP            avdtp.c)
+zephyr_library_sources_ifdef(CONFIG_BT_RFCOMM           rfcomm.c)
+
+zephyr_library_sources_ifdef(
+  CONFIG_BT_BREDR
+  br.c
+  keys_br.c
+  l2cap_br.c
+  sdp.c
+  ssp.c
+  )
+
+zephyr_library_sources_ifdef(
+  CONFIG_BT_HFP_HF
+  hfp_hf.c
+  at.c
+  )

subsys/bluetooth/host/classic/a2dp.c

@@ -23,8 +23,8 @@
 
 #include "common/assert.h"
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "conn_internal.h"
+#include "host/conn_internal.h"
 #include "avdtp_internal.h"
 #include "a2dp_internal.h"
 

subsys/bluetooth/host/classic/avdtp.c

@@ -18,8 +18,8 @@
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/avdtp.h>
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "conn_internal.h"
+#include "host/conn_internal.h"
 #include "l2cap_br_internal.h"
 #include "avdtp_internal.h"
 

subsys/bluetooth/host/classic/br.c

@@ -13,9 +13,9 @@
 
 #include "common/bt_str.h"
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "conn_internal.h"
+#include "host/conn_internal.h"
-#include "keys.h"
+#include "host/keys.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
 #include <zephyr/logging/log.h>

subsys/bluetooth/host/classic/hfp_hf.c

@@ -19,8 +19,8 @@
 #include <zephyr/bluetooth/rfcomm.h>
 #include <zephyr/bluetooth/hfp_hf.h>
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "conn_internal.h"
+#include "host/conn_internal.h"
 #include "l2cap_br_internal.h"
 #include "rfcomm_internal.h"
 #include "at.h"

subsys/bluetooth/host/classic/keys_br.c

@@ -18,9 +18,9 @@
 
 #include "common/bt_str.h"
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "settings.h"
+#include "host/settings.h"
-#include "keys.h"
+#include "host/keys.h"
 
 #define LOG_LEVEL CONFIG_BT_KEYS_LOG_LEVEL
 #include <zephyr/logging/log.h>

subsys/bluetooth/host/classic/l2cap_br.c

@@ -19,8 +19,8 @@
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/drivers/bluetooth/hci_driver.h>
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "conn_internal.h"
+#include "host/conn_internal.h"
 #include "l2cap_br_internal.h"
 #include "avdtp_internal.h"
 #include "a2dp_internal.h"

subsys/bluetooth/host/classic/rfcomm.c

@@ -22,8 +22,8 @@
 
 #include <zephyr/bluetooth/rfcomm.h>
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "conn_internal.h"
+#include "host/conn_internal.h"
 #include "l2cap_br_internal.h"
 #include "rfcomm_internal.h"
 

subsys/bluetooth/host/classic/sdp.c

@@ -19,8 +19,8 @@
 #include "common/bt_str.h"
 #include "common/assert.h"
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "conn_internal.h"
+#include "host/conn_internal.h"
 #include "l2cap_br_internal.h"
 #include "sdp_internal.h"
 

subsys/bluetooth/host/classic/ssp.c

@@ -15,10 +15,10 @@
 
 #include "common/bt_str.h"
 
-#include "keys.h"
+#include "host/keys.h"
 
-#include "hci_core.h"
+#include "host/hci_core.h"
-#include "conn_internal.h"
+#include "host/conn_internal.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
 #include <zephyr/logging/log.h>

subsys/bluetooth/host/conn.c

@@ -38,7 +38,7 @@
 #include "l2cap_internal.h"
 #include "keys.h"
 #include "smp.h"
-#include "ssp.h"
+#include "classic/ssp.h"
 #include "att_internal.h"
 #include "iso_internal.h"
 #include "direction_internal.h"

subsys/bluetooth/host/hci_core.c

@@ -52,7 +52,7 @@
 #include "settings.h"
 
 #if defined(CONFIG_BT_BREDR)
-#include "br.h"
+#include "classic/br.h"
 #endif
 
 #if defined(CONFIG_BT_DF)

subsys/bluetooth/host/l2cap_internal.h

@@ -10,7 +10,7 @@
 
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/sys/iterable_sections.h>
-#include "l2cap_br_interface.h"
+#include "classic/l2cap_br_interface.h"
 
 enum l2cap_conn_list_action {
 	BT_L2CAP_CHAN_LOOKUP,

tests/bluetooth/at/src/main.c

@@ -10,7 +10,7 @@
 
 #include <zephyr/net/buf.h>
 
-#include "subsys/bluetooth/host/at.h"
+#include "subsys/bluetooth/host/classic/at.h"
 
 #include <zephyr/ztest.h>