Skip to content

Commit e73abf7

Browse files
marcinszkudlinskimarcinszkudlinski
committed
buf: rename buffer.c to comp_buffer.c and move to buffers
comp_buffer, implemented in buffer.c file, should be kept in the buffers directory, together with all buffers Also it has been renamed to comp_buffer.c Signed-off-by: Marcin Szkudlinski <marcin.szkudlinski@intel.com>
1 parent 94a43a2 commit e73abf7

File tree

15 files changed

+44
-19
lines changed

15 files changed

+44
-19
lines changed

‎src/audio/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
1010
add_local_sources(sof
1111
host-legacy.c
1212
component.c
13-
buffer.c
1413
source_api_helper.c
1514
sink_api_helper.c
1615
sink_source_utils.c
1716
audio_stream.c
1817
channel_map.c
1918
)
2019

20+
add_subdirectory(buffers)
21+
2122
if(CONFIG_COMP_BLOB)
2223
add_local_sources(sof data_blob.c)
2324
endif()
@@ -128,7 +129,7 @@ endif()
128129
add_local_sources(sof
129130
component.c
130131
data_blob.c
131-
buffer.c
132+
buffers/comp_buffer.c
132133
buffers/audio_buffer.c
133134
source_api_helper.c
134135
sink_api_helper.c

‎src/audio/buffers/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# SPDX-License-Identifier: BSD-3-Clause
2+
3+
add_local_sources(sof audio_buffer.c)
4+
add_local_sources(sof comp_buffer.c)
5+
6+
if(CONFIG_PIPELINE_2_0)
7+
add_local_sources(sof ring_buffer.c)
8+
endif()

src/audio/buffer.c renamed to src/audio/buffers/comp_buffer.c

File renamed without changes.

‎test/cmocka/src/audio/buffer/CMakeLists.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
cmocka_test(buffer_copy
44
buffer_copy.c
55
${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
6-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
6+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
7+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
78
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
89
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
910
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c
@@ -27,7 +28,8 @@ cmocka_test(buffer_new
2728
buffer_new.c
2829
${PROJECT_SOURCE_DIR}/test/cmocka/src/common_mocks.c
2930
${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
30-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
31+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
32+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
3133
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
3234
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
3335
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c
@@ -50,7 +52,8 @@ cmocka_test(buffer_wrap
5052
buffer_wrap.c
5153
${PROJECT_SOURCE_DIR}/test/cmocka/src/common_mocks.c
5254
${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
53-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
55+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
56+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
5457
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
5558
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
5659
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c
@@ -73,7 +76,8 @@ cmocka_test(buffer_write
7376
buffer_write.c
7477
${PROJECT_SOURCE_DIR}/test/cmocka/src/common_mocks.c
7578
${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
76-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
79+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
80+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
7781
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
7882
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
7983
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c

‎test/cmocka/src/audio/component/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ cmocka_test(comp_set_state
99
${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
1010
${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
1111
${PROJECT_SOURCE_DIR}/src/ipc/ipc-helper.c
12-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
12+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
13+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
1314
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
1415
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
1516
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c

‎test/cmocka/src/audio/eq_fir/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ add_library(audio_for_eq_fir STATIC
2424
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module_adapter.c
2525
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module_adapter_ipc3.c
2626
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module/generic.c
27-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
27+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
28+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
2829
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
2930
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
3031
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c

‎test/cmocka/src/audio/eq_iir/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ add_library(audio_for_eq_iir STATIC
2525
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module_adapter.c
2626
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module_adapter_ipc3.c
2727
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module/generic.c
28-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
28+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
29+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
2930
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
3031
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
3132
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c

‎test/cmocka/src/audio/mixer/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ cmocka_test(mixer
1313
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module_adapter.c
1414
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module_adapter_ipc3.c
1515
${PROJECT_SOURCE_DIR}/src/audio/module_adapter/module/generic.c
16-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
16+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
17+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
1718
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
1819
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
1920
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c

‎test/cmocka/src/audio/mux/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ add_library(
1414
${PROJECT_SOURCE_DIR}/src/audio/mux/mux_generic.c
1515
${PROJECT_SOURCE_DIR}/src/audio/component.c
1616
${PROJECT_SOURCE_DIR}/src/audio/data_blob.c
17-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
17+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
18+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
1819
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
1920
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
2021
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c

‎test/cmocka/src/audio/pcm_converter/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ if(CONFIG_FORMAT_FLOAT)
66
${PROJECT_SOURCE_DIR}/src/math/numbers.c
77
${PROJECT_SOURCE_DIR}/src/audio/pcm_converter/pcm_converter.c
88
${PROJECT_SOURCE_DIR}/src/audio/pcm_converter/pcm_converter_generic.c
9-
${PROJECT_SOURCE_DIR}/src/audio/buffer.c
9+
${PROJECT_SOURCE_DIR}/src/audio/buffers/comp_buffer.c
10+
${PROJECT_SOURCE_DIR}/src/audio/buffers/audio_buffer.c
1011
${PROJECT_SOURCE_DIR}/src/audio/source_api_helper.c
1112
${PROJECT_SOURCE_DIR}/src/audio/sink_api_helper.c
1213
${PROJECT_SOURCE_DIR}/src/audio/sink_source_utils.c

0 commit comments

Comments
 (0)