Skip to content

Commit 4c26b85

Browse files
committed
modules: liblc3: Rename the module for consistency
The old project, liblc3codec, is not used anymore. Rename the Zephyr module name, folders, and Kconfig options based on the new name, liblc3. Signed-off-by: Carles Cufi <[email protected]>
1 parent 66d165b commit 4c26b85

File tree

13 files changed

+50
-50
lines changed

13 files changed

+50
-50
lines changed

MAINTAINERS.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,7 +2354,7 @@ West:
23542354
labels:
23552355
- manifest-libmetal
23562356

2357-
"West project: liblc3codec":
2357+
"West project: liblc3":
23582358
status: maintained
23592359
maintainers:
23602360
- Casper-Bonde-Bose
@@ -2363,9 +2363,9 @@ West:
23632363
- thalley
23642364
- asbjornsabo
23652365
files:
2366-
- modules/liblc3codec/
2366+
- modules/liblc3/
23672367
labels:
2368-
- manifest-liblc3codec
2368+
- manifest-liblc3
23692369

23702370
"West project: littlefs":
23712371
status: odd fixes

modules/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ comment "hal_gigadevice module not available."
5454
comment "hal_nordic module not available."
5555
depends on !ZEPHYR_HAL_NORDIC_MODULE
5656

57-
comment "liblc3codec module not available."
58-
depends on !ZEPHYR_LIBLC3CODEC_MODULE
57+
comment "liblc3 module not available."
58+
depends on !ZEPHYR_LIBLC3_MODULE
5959

6060
comment "LittleFS module not available."
6161
depends on !ZEPHYR_LITTLEFS_MODULE

modules/liblc3/CMakeLists.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
if(CONFIG_LIBLC3)
2+
3+
zephyr_library_named(liblc3)
4+
zephyr_library_compile_options(-O3 -std=c11 -ffast-math -Wno-array-bounds)
5+
6+
zephyr_include_directories(${ZEPHYR_LIBLC3_MODULE_DIR}/include)
7+
zephyr_include_directories(${ZEPHYR_LIBLC3_MODULE_DIR}/src)
8+
9+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/attdet.c)
10+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/bits.c)
11+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/bwdet.c)
12+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/energy.c)
13+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/lc3.c)
14+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/ltpf.c)
15+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/mdct.c)
16+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/plc.c)
17+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/sns.c)
18+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/spec.c)
19+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/tables.c)
20+
zephyr_library_sources(${ZEPHYR_LIBLC3_MODULE_DIR}/src/tns.c)
21+
22+
endif()

modules/liblc3/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Copyright (c) 2022 Bose Corporation
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
config LIBLC3
5+
bool "liblc3 Support"
6+
depends on FPU
7+
help
8+
This option enables the Android liblc3 library for Bluetooth LE Audio

modules/liblc3codec/CMakeLists.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

modules/liblc3codec/Kconfig

Lines changed: 0 additions & 8 deletions
This file was deleted.

samples/bluetooth/unicast_audio_client/boards/native_posix.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CONFIG_LOG_MODE_IMMEDIATE=y
22
CONFIG_BT_TINYCRYPT_ECC=y
33

4-
CONFIG_LIBLC3CODEC=y
4+
CONFIG_LIBLC3=y
55
CONFIG_FPU=y
66

77
# For LE-audio at 10ms intervals we need the tick counter to occur more frequently

samples/bluetooth/unicast_audio_client/boards/nrf5340dk_nrf5340_cpuapp.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# For LC3 the following configs are needed
22
CONFIG_FPU=y
3-
CONFIG_LIBLC3CODEC=y
3+
CONFIG_LIBLC3=y
44
# The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
55
# inctease stack size for that thread.
66
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096

samples/bluetooth/unicast_audio_client/src/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static uint32_t get_and_incr_seq_num(const struct bt_audio_stream *stream)
6868
return 0;
6969
}
7070

71-
#if defined(CONFIG_LIBLC3CODEC)
71+
#if defined(CONFIG_LIBLC3)
7272

7373
#include "lc3.h"
7474
#include "math.h"
@@ -752,7 +752,7 @@ static int init(void)
752752

753753
bt_gatt_cb_register(&gatt_callbacks);
754754

755-
#if defined(CONFIG_LIBLC3CODEC)
755+
#if defined(CONFIG_LIBLC3)
756756
k_work_init_delayable(&audio_send_work, lc3_audio_timer_timeout);
757757
#else
758758
k_work_init_delayable(&audio_send_work, audio_timer_timeout);
@@ -961,7 +961,7 @@ static int set_stream_qos(void)
961961

962962
static int enable_streams(void)
963963
{
964-
if (IS_ENABLED(CONFIG_LIBLC3CODEC)) {
964+
if (IS_ENABLED(CONFIG_LIBLC3)) {
965965
init_lc3();
966966
}
967967

samples/bluetooth/unicast_audio_server/boards/native_posix.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CONFIG_LOG_MODE_IMMEDIATE=y
22
CONFIG_BT_TINYCRYPT_ECC=y
33

4-
CONFIG_LIBLC3CODEC=y
4+
CONFIG_LIBLC3=y
55
CONFIG_FPU=y
66

77
# For LE-audio at 10ms intervals we need the tick counter to occur more frequently

0 commit comments

Comments
 (0)