michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: OTC: Move OTC files to OTS folder

Browse source 
Move the OTC files to the OTS folders for further refactoring.

Signed-off-by: Asbjørn Sæbø <asbjorn.sabo@nordicsemi.no>
This commit is contained in:
Asbjørn Sæbø 2021-12-13 13:35:07 +01:00 • committed by Carles Cufí
commit 0d6e18a052
13 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsys/bluetooth/audio/otc.h → include/bluetooth/services/otc.h
View file

@ -7,10 +7,8 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_BLUETOOTH_HOST_AUDIO_OTC_H_
#define ZEPHYR_INCLUDE_BLUETOOTH_HOST_AUDIO_OTC_H_
/* TODO: Temporarily here - clean up, and move alongside the Object Transfer Service */
#ifndef ZEPHYR_INCLUDE_BLUETOOTH_SERVICES_OTC_H_
#define ZEPHYR_INCLUDE_BLUETOOTH_SERVICES_OTC_H_
#include <stdbool.h>
#include <zephyr/types.h>
@ -557,4 +555,4 @@ void bt_otc_metadata_display(struct bt_otc_obj_metadata *metadata,
}
#endif
#endif /* ZEPHYR_INCLUDE_BLUETOOTH_HOST_AUDIO_OTC_H_ */
#endif /* ZEPHYR_INCLUDE_BLUETOOTH_SERVICES_OTC_H_ */

2
subsys/bluetooth/audio/CMakeLists.txt
View file

@ -32,8 +32,6 @@ if (CONFIG_BT_CSIS OR CONFIG_BT_CSIS_CLIENT)
zephyr_library_sources(csis_crypto.c)
endif()
zephyr_library_sources_ifdef(CONFIG_BT_OTC otc.c)
zephyr_library_sources_ifdef(CONFIG_BT_MCC mcc.c)
zephyr_library_sources_ifdef(CONFIG_BT_MCS mcs.c)

1
subsys/bluetooth/audio/Kconfig
View file

@ -31,7 +31,6 @@ rsource "Kconfig.aics"
rsource "Kconfig.vcs"
rsource "Kconfig.mics"
rsource "Kconfig.csis"
rsource "Kconfig.otc"
rsource "Kconfig.mcs"
endif # BT_AUDIO

4
subsys/bluetooth/audio/mcc.c
View file

@ -20,8 +20,8 @@
#include <bluetooth/gatt.h>
#include <bluetooth/audio/mcc.h>
#include "otc.h"
#include "otc_internal.h"
#include <bluetooth/services/otc.h>
#include "../services/ots/otc_internal.h"
/* TODO: Temporarily copied here from media_proxy_internal.h - clean up */
/* Debug output of 48 bit Object ID value */

4
subsys/bluetooth/services/CMakeLists.txt
View file

@ -9,4 +9,6 @@ zephyr_sources_ifdef(CONFIG_BT_HRS hrs.c)
zephyr_sources_ifdef(CONFIG_BT_TPS tps.c)
add_subdirectory_ifdef(CONFIG_BT_OTS ots)
if(CONFIG_BT_OTS OR CONFIG_BT_OTC)
add_subdirectory(ots)
endif()

1
subsys/bluetooth/services/Kconfig
View file

@ -15,5 +15,6 @@ rsource "Kconfig.hrs"
rsource "Kconfig.tps"
rsource "ots/Kconfig"
rsource "ots/Kconfig.otc"
endmenu

2
subsys/bluetooth/services/ots/CMakeLists.txt
View file

@ -9,3 +9,5 @@ zephyr_sources_ifdef(
ots_olcp.c)
zephyr_library_sources_ifdef(CONFIG_BT_OTS_DIR_LIST_OBJ ots_dir_list.c)
zephyr_library_sources_ifdef(CONFIG_BT_OTC otc.c)

0
subsys/bluetooth/audio/Kconfig.otc → subsys/bluetooth/services/ots/Kconfig.otc
View file

6
subsys/bluetooth/audio/otc.c → subsys/bluetooth/services/ots/otc.c
View file

@ -6,8 +6,6 @@
* SPDX-License-Identifier: Apache-2.0
*/
/* TODO: Temporarily here - clean up, and move alongside the Object Transfer Service */
#include <zephyr.h>
#include <zephyr/types.h>
@ -20,11 +18,11 @@
#include <bluetooth/gatt.h>
#include <bluetooth/l2cap.h>
#include "../host/conn_internal.h" /* To avoid build errors on use of struct bt_conn" */
#include "../../host/conn_internal.h" /* To avoid build errors on use of struct bt_conn" */
#include <bluetooth/services/ots.h>
#include <bluetooth/services/otc.h>
#include "otc_internal.h"
#include "otc.h"
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_OTC)
#define LOG_MODULE_NAME bt_otc

2
subsys/bluetooth/audio/otc_internal.h → subsys/bluetooth/services/ots/otc_internal.h
View file

@ -12,7 +12,7 @@
/* TODO: Temporarily here - clean up, and move alongside the Object Transfer Service */
#include "otc.h"
#include <bluetooth/services/otc.h>
#ifdef __cplusplus
extern "C" {

2
subsys/bluetooth/shell/mcc.c
View file

@ -17,7 +17,7 @@
#include "bt.h"
#include "../audio/otc.h"
#include "../services/ots/otc_internal.h"
#include "../audio/media_proxy_internal.h"
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_MCC)

2
tests/bluetooth/bsim_bt/bsim_test_audio/src/mcc_test.c
View file

@ -23,7 +23,7 @@
#include <bluetooth/audio/mcc.h>
#include <bluetooth/audio/media_proxy.h>
#include "../../../../../subsys/bluetooth/audio/otc.h"
#include <bluetooth/services/otc.h>
#include "common.h"

2
tests/bluetooth/bsim_bt/bsim_test_audio/src/media_controller_test.c
View file

@ -23,7 +23,7 @@
#include <bluetooth/audio/mcc.h>
#include <bluetooth/audio/media_proxy.h>
#include "../../../../../subsys/bluetooth/audio/otc.h"
#include <bluetooth/services/otc.h>
#include "common.h"