LE Audio: move GATT Services into src/le-audio/gatt-service

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  
 ### Changed
 - Mesh: move GATT Services into src/mesh/gatt-service
+- LE Audio: move GATT Services into src/le-audio/gatt-service
 - SM: delete bonding information for existing device with BD_ADDR, on new pairing with different IRK
 
 ## Release v1.5.4

src/btstack.h

@@ -83,12 +83,9 @@
 #include "ble/att_dispatch.h"
 #include "ble/att_server.h"
 #include "ble/gatt-service/ancs_client.h"
-#include "ble/gatt-service/audio_input_control_service_server.h"
 #include "ble/gatt-service/battery_service_client.h"
 #include "ble/gatt-service/battery_service_server.h"
 #include "ble/gatt-service/bond_management_service_server.h"
-#include "ble/gatt-service/broadcast_audio_scan_service_client.h"
-#include "ble/gatt-service/broadcast_audio_scan_service_server.h"
 #include "ble/gatt-service/cycling_power_service_server.h"
 #include "ble/gatt-service/cycling_speed_and_cadence_service_server.h"
 #include "ble/gatt-service/device_information_service_client.h"
@@ -96,19 +93,9 @@
 #include "ble/gatt-service/heart_rate_service_server.h"
 #include "ble/gatt-service/hids_client.h"
 #include "ble/gatt-service/hids_device.h"
-#include "ble/gatt-service/le_audio.h"
-#include "ble/gatt-service/le_audio_util.h"
-#include "ble/gatt-service/microphone_control_service_client.h"
-#include "ble/gatt-service/microphone_control_service_server.h"
 #include "ble/gatt-service/scan_parameters_service_client.h"
 #include "ble/gatt-service/scan_parameters_service_server.h"
 #include "ble/gatt-service/tx_power_service_server.h"
-#include "ble/gatt-service/volume_control_service_server.h"
-#include "ble/gatt-service/volume_offset_control_service_server.h"
-#ifdef ENABLE_MESH
-#include "mesh/gatt-service/mesh_provisioning_service_server.h"
-#include "mesh/gatt-service/mesh_proxy_service_server.h"
-#endif
 #include "ble/gatt_client.h"
 #include "ble/le_device_db.h"
 #include "ble/sm.h"
@@ -156,6 +143,16 @@
 #include "classic/spp_server.h"
 #endif
 
+#include "le-audio/le_audio.h"
+#include "le-audio/le_audio_util.h"
+#include "le-audio/gatt-service/audio_input_control_service_server.h"
+#include "le-audio/gatt-service/broadcast_audio_scan_service_client.h"
+#include "le-audio/gatt-service/broadcast_audio_scan_service_server.h"
+#include "le-audio/gatt-service/microphone_control_service_client.h"
+#include "le-audio/gatt-service/microphone_control_service_server.h"
+#include "le-audio/gatt-service/volume_control_service_server.h"
+#include "le-audio/gatt-service/volume_offset_control_service_server.h"
+
 #ifdef ENABLE_MESH
 #include "mesh/adv_bearer.h"
 #include "mesh/beacon.h"

src/le-audio/gatt-service/audio_input_control_service_server.c

@@ -45,7 +45,7 @@
 #include "bluetooth_gatt.h"
 #include "btstack_debug.h"
 
-#include "ble/gatt-service/audio_input_control_service_server.h"
+#include "le-audio/gatt-service/audio_input_control_service_server.h"
 
 #ifdef ENABLE_TESTING_SUPPORT
 #include <stdio.h>

src/le-audio/gatt-service/broadcast_audio_scan_service_client.c

@@ -46,8 +46,8 @@
 #include "btstack_util.h"
 #include "btstack_memory.h"
 
-#include "ble/gatt-service/le_audio_util.h"
-#include "ble/gatt-service/broadcast_audio_scan_service_client.h"
+#include "le-audio/le_audio_util.h"
+#include "le-audio/gatt-service/broadcast_audio_scan_service_client.h"
 
 #ifdef ENABLE_TESTING_SUPPORT
 #include <stdio.h>

src/le-audio/gatt-service/broadcast_audio_scan_service_client.h

@@ -45,9 +45,9 @@
 
 #include <stdint.h>
 #include "ble/gatt_client.h"
-#include "ble/gatt-service/broadcast_audio_scan_service_util.h"
 #include "btstack_defines.h"
-#include "le_audio.h"
+#include "le-audio/le_audio.h"
+#include "le-audio/gatt-service/broadcast_audio_scan_service_util.h"
 
 #if defined __cplusplus
 extern "C" {

src/le-audio/gatt-service/broadcast_audio_scan_service_server.c

@@ -47,8 +47,8 @@
 #include "btstack_event.h"
 #include "btstack_util.h"
 
-#include "ble/gatt-service/broadcast_audio_scan_service_server.h"
-#include "ble/gatt-service/le_audio_util.h"
+#include "le-audio/gatt-service/broadcast_audio_scan_service_server.h"
+#include "le-audio/le_audio_util.h"
 
 #ifdef ENABLE_TESTING_SUPPORT
 #include <stdio.h>

src/le-audio/gatt-service/broadcast_audio_scan_service_server.h

@@ -52,7 +52,7 @@
 #include <stdint.h>
 
 #include "btstack_defines.h"
-#include "le_audio.h"
+#include "le-audio/le_audio.h"
 
 #include "broadcast_audio_scan_service_util.h"
 

src/le-audio/gatt-service/broadcast_audio_scan_service_util.c

@@ -47,9 +47,9 @@
 #include "btstack_event.h"
 #include "btstack_util.h"
 
-#include "ble/gatt-service/broadcast_audio_scan_service_util.h"
-#include "ble/gatt-service/le_audio.h"
-#include "ble/gatt-service/le_audio_util.h"
+#include "le-audio/gatt-service/broadcast_audio_scan_service_util.h"
+#include "le-audio/le_audio.h"
+#include "le-audio/le_audio_util.h"
 
 #ifdef ENABLE_TESTING_SUPPORT
 #include <stdio.h>

src/le-audio/gatt-service/broadcast_audio_scan_service_util.h

@@ -42,7 +42,7 @@
 #include <stdint.h>
 
 #include "btstack_bool.h"
-#include "le_audio.h"
+#include "le-audio/le_audio.h"
 
 #if defined __cplusplus
 extern "C" {

src/le-audio/gatt-service/microphone_control_service_client.c

@@ -48,7 +48,7 @@
 #include <string.h>
 
 
-#include "ble/gatt-service/microphone_control_service_client.h"
+#include "le-audio/gatt-service/microphone_control_service_client.h"
 
 #include "btstack_memory.h"
 #include "ble/core.h"

src/le-audio/gatt-service/microphone_control_service_server.c

@@ -50,8 +50,8 @@
 #include "btstack_debug.h"
 #include "btstack_defines.h"
 
-#include "ble/gatt-service/microphone_control_service_server.h"
-#include "ble/gatt-service/audio_input_control_service_server.h"
+#include "le-audio/gatt-service/microphone_control_service_server.h"
+#include "le-audio/gatt-service/audio_input_control_service_server.h"
 
 static btstack_context_callback_registration_t  mc_mute_callback;
 static att_service_handler_t       microphone_control;

src/le-audio/gatt-service/microphone_control_service_server.h

@@ -44,7 +44,7 @@
 #define MICROPHONE_CONTROL_SERVICE_SERVER_H
 
 #include <stdint.h>
-#include "ble/gatt-service/audio_input_control_service_server.h"
+#include "le-audio/gatt-service/audio_input_control_service_server.h"
 
 #if defined __cplusplus
 extern "C" {

src/le-audio/gatt-service/volume_control_service_server.c

@@ -50,9 +50,9 @@
 #include "bluetooth_gatt.h"
 #include "btstack_debug.h"
 
-#include "ble/gatt-service/volume_control_service_server.h"
-#include "ble/gatt-service/audio_input_control_service_server.h"
-#include "ble/gatt-service/volume_offset_control_service_server.h"
+#include "le-audio/gatt-service/volume_control_service_server.h"
+#include "le-audio/gatt-service/audio_input_control_service_server.h"
+#include "le-audio/gatt-service/volume_offset_control_service_server.h"
 
 #define VCS_CMD_RELATIVE_VOLUME_DOWN                0x00
 #define VCS_CMD_RELATIVE_VOLUME_UP                  0x01

src/le-audio/gatt-service/volume_control_service_server.h

@@ -45,8 +45,8 @@
 
 #include <stdint.h>
 
-#include "ble/gatt-service/audio_input_control_service_server.h"
-#include "ble/gatt-service/volume_offset_control_service_server.h"
+#include "le-audio/gatt-service/audio_input_control_service_server.h"
+#include "le-audio/gatt-service/volume_offset_control_service_server.h"
 
 #if defined __cplusplus
 extern "C" {

src/le-audio/gatt-service/volume_offset_control_service_server.c

@@ -45,7 +45,7 @@
 #include "bluetooth_gatt.h"
 #include "btstack_debug.h"
 
-#include "ble/gatt-service/volume_offset_control_service_server.h"
+#include "le-audio/gatt-service/volume_offset_control_service_server.h"
 
 #ifdef ENABLE_TESTING_SUPPORT
 #include <stdio.h>

src/le-audio/le_audio_util.c

@@ -39,7 +39,7 @@
 
 #include "btstack_util.h"
 #include "btstack_debug.h"
-#include "ble/gatt-service/le_audio_util.h"
+#include "le-audio/le_audio_util.h"
 
 // help with buffer == NULL
 uint16_t le_audio_virtual_memcpy_helper(

test/le_audio/CMakeLists.txt

@@ -98,6 +98,7 @@ file(GLOB SOURCES_SRC       "../../src/*.c" "../../src/*.cpp" "../../example/sco
 file(GLOB SOURCES_BLE       "../../src/ble/*.c")
 file(GLOB SOURCES_GATT      "../../src/ble/gatt-service/*.c")
 file(GLOB SOURCES_CLASSIC   "../../src/classic/*.c")
+file(GLOB SOURCES_LE_AUDIO  "../../src/le-audio/*.c" "../../src/le-audio/gatt-service/*.c")
 file(GLOB SOURCES_MESH      "../../src/mesh/*.c")
 file(GLOB SOURCES_MD5       "../../3rd-party/md5/md5.c")
 file(GLOB SOURCES_UECC      "../../3rd-party/micro-ecc/uECC.c")
@@ -105,7 +106,7 @@ file(GLOB SOURCES_YXML      "../../3rd-party/yxml/yxml.c")
 file(GLOB SOURCES_HXCMOD    "../../3rd-party/hxcmod-player/*.c"  "../../3rd-party/hxcmod-player/mods/*.c")
 file(GLOB SOURCES_RIJNDAEL  "../../3rd-party/rijndael/rijndael.c")
 file(GLOB SOURCES_POSIX     "../../platform/posix/*.c")
-file(GLOB SOURCES_MAIN      "../../src/le-audio/le_audio_base_builder.c"  "../../src/le-audio/le_audio_base_parser.c" "main.c" "btstack_lc3plus_fraunhofer.c")
+file(GLOB SOURCES_MAIN      "main.c" "btstack_lc3plus_fraunhofer.c")
 file(GLOB SOURCES_ZEPHYR    "../../chipset/zephyr/*.c")
 file(GLOB SOURCES_LC3_GOOGLE "../../3rd-party/lc3-google/src/*.c")
 
@@ -125,6 +126,7 @@ set(SOURCES
 	${SOURCES_SRC}
 	${SOURCES_BLE}
 	${SOURCES_GATT}
+	${SOURCES_LE_AUDIO}
 	${SOURCES_MESH}
 	${SOURCES_CLASSIC} 
 	${SOURCES_UECC}

test/le_audio/le_audio_broadcast_assistant.c

@@ -51,7 +51,6 @@
 #include <inttypes.h>
 
 #include "ad_parser.h"
-#include "ble/gatt-service/broadcast_audio_scan_service_client.h"
 #include "ble/sm.h"
 #include "bluetooth_data_types.h"
 #include "bluetooth_gatt.h"
@@ -65,6 +64,7 @@
 #include "gap.h"
 #include "hci.h"
 #include "l2cap.h"
+#include "le-audio/gatt-service/broadcast_audio_scan_service_client.h"
 #include "le-audio/le_audio_base_parser.h"
 
 static void show_usage(void);

test/le_audio/le_audio_broadcast_sink.c

@@ -51,7 +51,6 @@
 #include <inttypes.h>
 
 #include "ad_parser.h"
-#include "ble/gatt-service/broadcast_audio_scan_service_server.h"
 #include "ble/att_server.h"
 #include "ble/sm.h"
 #include "bluetooth_data_types.h"
@@ -71,6 +70,7 @@
 #include "btstack_lc3plus_fraunhofer.h"
 #include "l2cap.h"
 #include "le-audio/le_audio_base_parser.h"
+#include "le-audio/gatt-service/broadcast_audio_scan_service_server.h"
 
 #include "le_audio_broadcast_sink.h"
 

test/pts/CMakeLists.txt

@@ -104,6 +104,7 @@ file(GLOB SOURCES_SRC       "../../src/*.c" "../../example/sco_demo_util.c")
 file(GLOB SOURCES_BLE       "../../src/ble/*.c")
 file(GLOB SOURCES_GATT      "../../src/ble/gatt-service/*.c")
 file(GLOB SOURCES_CLASSIC   "../../src/classic/*.c")
+file(GLOB SOURCES_LE_AUDIO  "../../src/le-audio/*.c" "../../src/le-audio/gatt-service/*.c")
 file(GLOB SOURCES_MESH      "../../src/mesh/*.c")
 file(GLOB SOURCES_BLUEDROID "../../3rd-party/bluedroid/encoder/srce/*.c" "../../3rd-party/bluedroid/decoder/srce/*.c")
 file(GLOB SOURCES_MD5       "../../3rd-party/md5/md5.c")
@@ -174,6 +175,7 @@ set(SOURCES
 	${SOURCES_SRC}
 	${SOURCES_BLE}
 	${SOURCES_GATT}
+	${SOURCES_LE_AUDIO}
 	${SOURCES_MESH}
 	${SOURCES_CLASSIC} 
 	${SOURCES_UECC}

test/pts/pbap_pce_test.c

@@ -51,6 +51,7 @@
 #include "classic/rfcomm.h"
 #include "btstack_event.h"
 #include "classic/goep_client.h"
+#include "classic/pbap.h"
 #include "classic/pbap_client.h"
 
 #include "btstack_stdin.h"