ipc: split IPC major code into IPC specific directories

Prepare for supporting new IPC major versions by partitioning IPC code into directories. This is a code move only, no code changes except Makefiles. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
marc-hb · May 31, 2021 · d62e926 · d62e926
1 parent 56b0f61
commit d62e926
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 28 deletions.
diff --git a/src/ipc/CMakeLists.txt b/src/ipc/CMakeLists.txt
@@ -1,11 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 if (CONFIG_IPC_MAJOR_3)
-	add_local_sources(sof
-		handler-ipc3.c
-		helper-ipc3.c
-		dai-ipc3.c
-	)
+	add_subdirectory(ipc3)
 endif()
 
 add_local_sources(sof
@@ -20,8 +16,3 @@ endif()
 if (CONFIG_LIBRARY)
 	return()
 endif()
-
-if (CONFIG_HOST_PTABLE)
-	add_local_sources(sof
-		ipc-host-ptable.c)
-endif()
diff --git a/src/ipc/ipc3/CMakeLists.txt b/src/ipc/ipc3/CMakeLists.txt
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_local_sources(sof
+		handler.c
+		helper.c
+		dai.c
+)
+
+if (CONFIG_HOST_PTABLE)
+	add_local_sources(sof
+		host-page-table.c)
+endif()
diff --git a/src/ipc/dai-ipc3.c → src/ipc/ipc3/dai.c b/src/ipc/dai-ipc3.c → src/ipc/ipc3/dai.c
diff --git a/src/ipc/handler-ipc3.c → src/ipc/ipc3/handler.c b/src/ipc/handler-ipc3.c → src/ipc/ipc3/handler.c
diff --git a/src/ipc/helper-ipc3.c → src/ipc/ipc3/helper.c b/src/ipc/helper-ipc3.c → src/ipc/ipc3/helper.c
diff --git a/src/ipc/ipc-host-ptable.c → src/ipc/ipc3/host-page-table.c b/src/ipc/ipc-host-ptable.c → src/ipc/ipc3/host-page-table.c
diff --git a/test/cmocka/src/audio/buffer/CMakeLists.txt b/test/cmocka/src/audio/buffer/CMakeLists.txt
@@ -4,7 +4,7 @@ cmocka_test(buffer_copy
 	buffer_copy.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-graph.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-params.c
@@ -17,7 +17,7 @@ cmocka_test(buffer_new
 	buffer_new.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-graph.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-params.c
@@ -30,7 +30,7 @@ cmocka_test(buffer_wrap
 	buffer_wrap.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-graph.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-params.c
@@ -43,7 +43,7 @@ cmocka_test(buffer_write
 	buffer_write.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-graph.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-params.c

diff --git a/test/cmocka/src/audio/component/CMakeLists.txt b/test/cmocka/src/audio/component/CMakeLists.txt
@@ -3,7 +3,7 @@
 cmocka_test(comp_set_state
 	comp_set_state.c
 	${PROJECT_SOURCE_DIR}/src/audio/component.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c

diff --git a/test/cmocka/src/audio/mixer/CMakeLists.txt b/test/cmocka/src/audio/mixer/CMakeLists.txt
@@ -6,7 +6,7 @@ cmocka_test(mixer
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
 	${PROJECT_SOURCE_DIR}/src/audio/mixer.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-graph.c

diff --git a/test/cmocka/src/audio/mux/CMakeLists.txt b/test/cmocka/src/audio/mux/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(
 	${PROJECT_SOURCE_DIR}/src/audio/mux/mux_generic.c
 	${PROJECT_SOURCE_DIR}/src/audio/component.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 )
 sof_append_relative_path_definitions(audio_mux)

diff --git a/test/cmocka/src/audio/pcm_converter/CMakeLists.txt b/test/cmocka/src/audio/pcm_converter/CMakeLists.txt
@@ -6,7 +6,7 @@ if(CONFIG_FORMAT_FLOAT)
 		${PROJECT_SOURCE_DIR}/src/audio/pcm_converter/pcm_converter.c
 		${PROJECT_SOURCE_DIR}/src/audio/pcm_converter/pcm_converter_generic.c
 		${PROJECT_SOURCE_DIR}/src/audio/buffer.c
-		${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+		${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 		${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 		${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 		${PROJECT_SOURCE_DIR}/src/audio/buffer.c

diff --git a/test/cmocka/src/audio/pipeline/CMakeLists.txt b/test/cmocka/src/audio/pipeline/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 
 cmocka_test(pipeline_new
 	pipeline_new.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
@@ -33,7 +33,7 @@ cmocka_test(pipeline_new
 cmocka_test(pipeline_connect_upstream
 	pipeline_connect_upstream.c
 	pipeline_connection_mocks.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
@@ -47,7 +47,7 @@ cmocka_test(pipeline_connect_upstream
 cmocka_test(pipeline_free
 	pipeline_free.c
 	pipeline_connection_mocks.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c

diff --git a/test/cmocka/src/audio/selector/CMakeLists.txt b/test/cmocka/src/audio/selector/CMakeLists.txt
@@ -15,7 +15,7 @@ add_library(audio_for_selector STATIC
 	${PROJECT_SOURCE_DIR}/src/audio/selector/selector.c
 	${PROJECT_SOURCE_DIR}/src/audio/selector/selector_generic.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c

diff --git a/test/cmocka/src/audio/volume/CMakeLists.txt b/test/cmocka/src/audio/volume/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(audio_for_volume STATIC
 	${PROJECT_SOURCE_DIR}/src/audio/volume/volume_generic.c
 	${PROJECT_SOURCE_DIR}/src/audio/volume/volume_hifi3.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-graph.c

diff --git a/test/cmocka/src/math/fft/CMakeLists.txt b/test/cmocka/src/math/fft/CMakeLists.txt
@@ -5,7 +5,7 @@ cmocka_test(fft
 	${PROJECT_SOURCE_DIR}/src/math/fft/fft.c
 	${PROJECT_SOURCE_DIR}/src/audio/buffer.c
 	${PROJECT_SOURCE_DIR}/test/cmocka/src/notifier_mocks.c
-	${PROJECT_SOURCE_DIR}/src/ipc/helper-ipc3.c
+	${PROJECT_SOURCE_DIR}/src/ipc/ipc3/helper.c
 	${PROJECT_SOURCE_DIR}/src/ipc/ipc-common.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-graph.c
 	${PROJECT_SOURCE_DIR}/src/audio/pipeline/pipeline-params.c

diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
@@ -352,10 +352,10 @@ zephyr_include_directories(${SOF_PLATFORM_PATH}/${PLATFORM}/include)
 zephyr_library_sources(
 	${SOF_IPC_PATH}/dma-copy.c
 	${SOF_IPC_PATH}/ipc-common.c
-	${SOF_IPC_PATH}/handler-ipc3.c
-	${SOF_IPC_PATH}/helper-ipc3.c
-	${SOF_IPC_PATH}/dai-ipc3.c
-	${SOF_IPC_PATH}/ipc-host-ptable.c
+	${SOF_IPC_PATH}/ipc3/handler.c
+	${SOF_IPC_PATH}/ipc3/helper.c
+	${SOF_IPC_PATH}/ipc3/dai.c
+	${SOF_IPC_PATH}/ipc3/host-page-table.c
 	${SOF_SRC_PATH}/spinlock.c
 
 	# SOF math utilities