host/audio: move old LE Audio files to new directory

LE Audio lives now in nimble/host/audio.
apache · Feb 29, 2024 · e328c7c · e328c7c
1 parent ebe1e78
commit e328c7c
Show file tree

Hide file tree

Showing 24 changed files with 312 additions and 333 deletions.
diff --git a/.github/test_build_apps_syscfg.yml b/.github/test_build_apps_syscfg.yml
@@ -27,6 +27,7 @@ syscfg.vals:
     BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS: 1
     BLE_ISO: 1
     BLE_ISO_TEST: 1
+    BLE_AUDIO: 1
     BLE_ISO_BROADCAST_SOURCE: 1
     BLE_HCI_VS: 1
     BLE_POWER_CONTROL: 1

diff --git a/apps/auracast/pkg.yml b/apps/auracast/pkg.yml
@@ -30,10 +30,10 @@ pkg.deps:
     - nimble/host/util
     - nimble/host/services/gap
     - nimble/host/store/config
+    - nimble/host/audio/services/auracast
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/sys/console"
     - "@apache-mynewt-core/sys/log"
     - "@apache-mynewt-core/sys/stats"
     - "@apache-mynewt-core/sys/sysinit"
     - "@apache-mynewt-core/sys/id"
-    - "@apache-mynewt-nimble/nimble/host/services/auracast"
diff --git a/apps/auracast/syscfg.yml b/apps/auracast/syscfg.yml
@@ -59,4 +59,6 @@ syscfg.vals:
     BLE_MAX_BIG: 1
     BLE_MAX_BIS: 2
 
-    BLE_PHY_NRF52_HEADERMASK_WORKAROUND: 1
+    BLE_PHY_NRF52_HEADERMASK_WORKAROUND: 1
+
+    BLE_AUDIO: 1
diff --git a/apps/btshell/pkg.yml b/apps/btshell/pkg.yml
@@ -36,5 +36,8 @@ pkg.deps:
     - nimble/host/store/config
     - nimble/host/util
 
+pkg.deps.BLE_AUDIO:
+    - nimble/host/audio
+
 pkg.deps.BTSHELL_ANS:
     - nimble/host/services/ans
diff --git a/apps/btshell/src/btshell.h b/apps/btshell/src/btshell.h
@@ -29,7 +29,7 @@
 #include "host/ble_gatt.h"
 #include "host/ble_gap.h"
 #if (MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE))
-#include "host/ble_audio_broadcast_source.h"
+#include "audio/ble_audio_bcst_source.h"
 #endif
 
 #ifdef __cplusplus

diff --git a/apps/btshell/src/cmd_leaudio.c b/apps/btshell/src/cmd_leaudio.c
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-#include "host/ble_audio_broadcast_source.h"
 #include "cmd_leaudio.h"
 #include "btshell.h"
 #include "console/console.h"
 #include "errno.h"
 
-#if (MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE))
+#if (MYNEWT_VAL(BLE_AUDIO))
+#include "audio/ble_audio_bcst_source.h"
 int
 cmd_leaudio_base_add(int argc, char **argv)
 {

diff --git a/apps/btshell/src/main.c b/apps/btshell/src/main.c
@@ -41,8 +41,10 @@
 #include "host/ble_gatt.h"
 #include "host/ble_store.h"
 #include "host/ble_sm.h"
-#include "host/ble_audio_common.h"
-#include "host/ble_audio_broadcast_source.h"
+#if MYNEWT_VAL(BLE_AUDIO)
+#include "audio/ble_audio_bcst_source.h"
+#include "audio/ble_audio.h"
+#endif
 #include "host/util/util.h"
 
 /* Mandatory services. */

diff --git a/apps/leaudio_broadcaster/pkg.yml b/apps/leaudio_broadcaster/pkg.yml
@@ -30,6 +30,7 @@ pkg.deps:
     - nimble/host/util
     - nimble/host/services/gap
     - nimble/host/store/config
+    - nimble/host/audio
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/sys/console"
     - "@apache-mynewt-core/sys/log"

diff --git a/apps/leaudio_broadcaster/src/main.c b/apps/leaudio_broadcaster/src/main.c
@@ -24,8 +24,8 @@
 #include "host/ble_hs.h"
 #include "host/util/util.h"
 
-#include "host/ble_audio_broadcast_source.h"
-#include "host/ble_audio_common.h"
+#include "audio/ble_audio_bcst_source.h"
+#include "audio/ble_audio.h"
 #include "host/ble_iso.h"
 
 #include "hal/hal_gpio.h"

diff --git a/apps/leaudio_broadcaster/syscfg.yml b/apps/leaudio_broadcaster/syscfg.yml
@@ -52,6 +52,7 @@ syscfg.vals:
     MSYS_1_BLOCK_COUNT: 32
 
     BLE_VERSION: 54
+    BLE_AUDIO: 1
     BLE_ISO: 1
     BLE_ISO_BROADCAST_SOURCE: 1
     BLE_MAX_BIG: 1