From fec1612ecc6cc22ef908d4557a84da171e9e4f13 Mon Sep 17 00:00:00 2001 From: Tomasz Lauda Date: Wed, 15 May 2019 15:04:52 +0200 Subject: [PATCH 1/4] audio: put multifile components to directories This patch moves multifile components to separate directories. All component headers are also moved to include/sof/audio. Signed-off-by: Tomasz Lauda --- src/audio/CMakeLists.txt | 34 ++++--------------- src/audio/eq_fir/CMakeLists.txt | 1 + src/audio/{ => eq_fir}/eq_fir.c | 8 ++--- src/audio/{ => eq_fir}/fir.c | 4 +-- src/audio/{ => eq_fir}/fir_hifi2ep.c | 4 +-- src/audio/{ => eq_fir}/fir_hifi3.c | 4 +-- src/audio/eq_iir/CMakeLists.txt | 1 + src/audio/{ => eq_iir}/eq_iir.c | 4 +-- src/audio/{ => eq_iir}/iir.c | 2 +- src/audio/selector/CMakeLists.txt | 1 + src/audio/{ => selector}/selector.c | 2 +- src/audio/{ => selector}/selector_generic.c | 2 +- src/audio/src/CMakeLists.txt | 1 + src/audio/{ => src}/src.c | 5 ++- src/audio/{ => src}/src_generic.c | 5 ++- src/audio/{ => src}/src_hifi2ep.c | 5 ++- src/audio/{ => src}/src_hifi3.c | 5 ++- src/audio/volume/CMakeLists.txt | 1 + src/audio/{ => volume}/volume.c | 2 +- src/audio/{ => volume}/volume_generic.c | 2 +- src/audio/{ => volume}/volume_hifi3.c | 2 +- src/{audio => include/sof/audio/eq_fir}/fir.h | 2 +- .../sof/audio/eq_fir}/fir_config.h | 0 .../sof/audio/eq_fir}/fir_hifi2ep.h | 2 +- .../sof/audio/eq_fir}/fir_hifi3.h | 2 +- .../sof/audio/eq_iir}/eq_iir.h | 0 src/{audio => include/sof/audio/eq_iir}/iir.h | 0 src/{ => include/sof}/audio/selector.h | 0 src/{audio => include/sof/audio/src}/src.h | 0 .../sof/audio/src}/src_config.h | 0 src/{ => include/sof}/audio/volume.h | 0 test/cmocka/src/audio/selector/CMakeLists.txt | 4 +-- .../cmocka/src/audio/selector/selector_test.c | 2 +- test/cmocka/src/audio/volume/CMakeLists.txt | 6 ++-- test/cmocka/src/audio/volume/volume_process.c | 2 +- 35 files changed, 48 insertions(+), 67 deletions(-) create mode 100644 src/audio/eq_fir/CMakeLists.txt rename src/audio/{ => eq_fir}/eq_fir.c (99%) rename src/audio/{ => eq_fir}/fir.c (98%) rename src/audio/{ => eq_fir}/fir_hifi2ep.c (99%) rename src/audio/{ => eq_fir}/fir_hifi3.c (99%) create mode 100644 src/audio/eq_iir/CMakeLists.txt rename src/audio/{ => eq_iir}/eq_iir.c (99%) rename src/audio/{ => eq_iir}/iir.c (99%) create mode 100644 src/audio/selector/CMakeLists.txt rename src/audio/{ => selector}/selector.c (99%) rename src/audio/{ => selector}/selector_generic.c (99%) create mode 100644 src/audio/src/CMakeLists.txt rename src/audio/{ => src}/src.c (99%) rename src/audio/{ => src}/src_generic.c (99%) rename src/audio/{ => src}/src_hifi2ep.c (99%) rename src/audio/{ => src}/src_hifi3.c (99%) create mode 100644 src/audio/volume/CMakeLists.txt rename src/audio/{ => volume}/volume.c (99%) rename src/audio/{ => volume}/volume_generic.c (99%) rename src/audio/{ => volume}/volume_hifi3.c (99%) rename src/{audio => include/sof/audio/eq_fir}/fir.h (99%) rename src/{audio => include/sof/audio/eq_fir}/fir_config.h (100%) rename src/{audio => include/sof/audio/eq_fir}/fir_hifi2ep.h (99%) rename src/{audio => include/sof/audio/eq_fir}/fir_hifi3.h (99%) rename src/{audio => include/sof/audio/eq_iir}/eq_iir.h (100%) rename src/{audio => include/sof/audio/eq_iir}/iir.h (100%) rename src/{ => include/sof}/audio/selector.h (100%) rename src/{audio => include/sof/audio/src}/src.h (100%) rename src/{audio => include/sof/audio/src}/src_config.h (100%) rename src/{ => include/sof}/audio/volume.h (100%) diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt index a947496ce50d..cd03493ac4c3 100644 --- a/src/audio/CMakeLists.txt +++ b/src/audio/CMakeLists.txt @@ -7,33 +7,16 @@ if(NOT BUILD_LIBRARY) buffer.c ) if(CONFIG_COMP_VOLUME) - add_local_sources(sof - volume.c - volume_generic.c - volume_hifi3.c - ) + add_subdirectory(volume) endif() if(CONFIG_COMP_SRC) - add_local_sources(sof - src.c - src_generic.c - src_hifi2ep.c - src_hifi3.c - ) + add_subdirectory(src) endif() if(CONFIG_COMP_FIR) - add_local_sources(sof - eq_fir.c - fir.c - fir_hifi2ep.c - fir_hifi3.c - ) + add_subdirectory(eq_fir) endif() if(CONFIG_COMP_IIR) - add_local_sources(sof - eq_iir.c - iir.c - ) + add_subdirectory(eq_iir) endif() if(CONFIG_COMP_TONE) add_local_sources(sof @@ -66,10 +49,7 @@ if(NOT BUILD_LIBRARY) ) endif() if(CONFIG_COMP_SEL) - add_local_sources(sof - selector.c - selector_generic.c - ) + add_subdirectory(selector) endif() if(CONFIG_COMP_TEST_KEYPHRASE) add_local_sources(sof @@ -121,8 +101,8 @@ check_optimization(hifi3 -mhifi3 -DOPS_HIFI3) set(sof_audio_modules volume src) # sources for each module -set(volume_sources volume.c volume_generic.c) -set(src_sources src.c src_generic.c) +set(volume_sources volume/volume.c volume/volume_generic.c) +set(src_sources src/src.c src/src_generic.c) foreach(audio_module ${sof_audio_modules}) # first compile with no optimizations diff --git a/src/audio/eq_fir/CMakeLists.txt b/src/audio/eq_fir/CMakeLists.txt new file mode 100644 index 000000000000..5c50d791dc14 --- /dev/null +++ b/src/audio/eq_fir/CMakeLists.txt @@ -0,0 +1 @@ +add_local_sources(sof eq_fir.c fir_hifi2ep.c fir_hifi3.c fir.c) diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir/eq_fir.c similarity index 99% rename from src/audio/eq_fir.c rename to src/audio/eq_fir/eq_fir.c index 3592491ea71e..fc419dee3965 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir/eq_fir.c @@ -33,20 +33,20 @@ #include #include #include +#include #include #include -#include "fir_config.h" #if FIR_GENERIC -#include "fir.h" +#include #endif #if FIR_HIFIEP -#include "fir_hifi2ep.h" +#include #endif #if FIR_HIFI3 -#include "fir_hifi3.h" +#include #endif #ifdef MODULE_TEST diff --git a/src/audio/fir.c b/src/audio/eq_fir/fir.c similarity index 98% rename from src/audio/fir.c rename to src/audio/eq_fir/fir.c index 7e3ee562acd5..c0c2e3d7a2cf 100644 --- a/src/audio/fir.c +++ b/src/audio/eq_fir/fir.c @@ -34,13 +34,13 @@ #include #include #include +#include #include #include -#include "fir_config.h" #if FIR_GENERIC -#include "fir.h" +#include /* * EQ FIR algorithm code diff --git a/src/audio/fir_hifi2ep.c b/src/audio/eq_fir/fir_hifi2ep.c similarity index 99% rename from src/audio/fir_hifi2ep.c rename to src/audio/eq_fir/fir_hifi2ep.c index 5903924f9713..007119736d36 100644 --- a/src/audio/fir_hifi2ep.c +++ b/src/audio/eq_fir/fir_hifi2ep.c @@ -32,15 +32,15 @@ #include #include #include +#include #include #include -#include "fir_config.h" #if FIR_HIFIEP #include #include -#include "fir_hifi2ep.h" +#include /* * EQ FIR algorithm code diff --git a/src/audio/fir_hifi3.c b/src/audio/eq_fir/fir_hifi3.c similarity index 99% rename from src/audio/fir_hifi3.c rename to src/audio/eq_fir/fir_hifi3.c index c928af91cb94..24f97e2aa63c 100644 --- a/src/audio/fir_hifi3.c +++ b/src/audio/eq_fir/fir_hifi3.c @@ -32,15 +32,15 @@ #include #include #include +#include #include #include -#include "fir_config.h" #if FIR_HIFI3 #include #include -#include "fir_hifi3.h" +#include /* * EQ FIR algorithm code diff --git a/src/audio/eq_iir/CMakeLists.txt b/src/audio/eq_iir/CMakeLists.txt new file mode 100644 index 000000000000..022d82ed234e --- /dev/null +++ b/src/audio/eq_iir/CMakeLists.txt @@ -0,0 +1 @@ +add_local_sources(sof eq_iir.c iir.c) diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir/eq_iir.c similarity index 99% rename from src/audio/eq_iir.c rename to src/audio/eq_iir/eq_iir.c index 8219f18d2e8b..92a58a06d48b 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir/eq_iir.c @@ -40,10 +40,10 @@ #include #include #include +#include #include +#include #include -#include "eq_iir.h" -#include "iir.h" #ifdef MODULE_TEST #include diff --git a/src/audio/iir.c b/src/audio/eq_iir/iir.c similarity index 99% rename from src/audio/iir.c rename to src/audio/eq_iir/iir.c index 56121b5f39ae..183c24f27245 100644 --- a/src/audio/iir.c +++ b/src/audio/eq_iir/iir.c @@ -39,8 +39,8 @@ #endif #include +#include #include -#include "iir.h" /* * Direct form II transposed second order filter block (biquad) diff --git a/src/audio/selector/CMakeLists.txt b/src/audio/selector/CMakeLists.txt new file mode 100644 index 000000000000..4bdb90466a11 --- /dev/null +++ b/src/audio/selector/CMakeLists.txt @@ -0,0 +1 @@ +add_local_sources(sof selector_generic.c selector.c) diff --git a/src/audio/selector.c b/src/audio/selector/selector.c similarity index 99% rename from src/audio/selector.c rename to src/audio/selector/selector.c index de6d61260478..0f366065267b 100644 --- a/src/audio/selector.c +++ b/src/audio/selector/selector.c @@ -46,7 +46,7 @@ #include #include #include -#include "selector.h" +#include #include /** diff --git a/src/audio/selector_generic.c b/src/audio/selector/selector_generic.c similarity index 99% rename from src/audio/selector_generic.c rename to src/audio/selector/selector_generic.c index b4ae83da9534..f296175e182d 100644 --- a/src/audio/selector_generic.c +++ b/src/audio/selector/selector_generic.c @@ -34,7 +34,7 @@ * \authors Lech Betlej */ -#include "selector.h" +#include /** * \brief Channel selection for 16 bit, 1 channel data format. diff --git a/src/audio/src/CMakeLists.txt b/src/audio/src/CMakeLists.txt new file mode 100644 index 000000000000..2ef41f607d74 --- /dev/null +++ b/src/audio/src/CMakeLists.txt @@ -0,0 +1 @@ +add_local_sources(sof src_generic.c src_hifi2ep.c src_hifi3.c src.c) diff --git a/src/audio/src.c b/src/audio/src/src.c similarity index 99% rename from src/audio/src.c rename to src/audio/src/src.c index d5de96c26c03..310bf06036a7 100644 --- a/src/audio/src.c +++ b/src/audio/src/src.c @@ -43,12 +43,11 @@ #include #include #include +#include +#include #include #include -#include "src_config.h" -#include "src.h" - #if SRC_SHORT #include #include diff --git a/src/audio/src_generic.c b/src/audio/src/src_generic.c similarity index 99% rename from src/audio/src_generic.c rename to src/audio/src/src_generic.c index 261c8f23cff8..6446ca13233d 100644 --- a/src/audio/src_generic.c +++ b/src/audio/src/src_generic.c @@ -36,11 +36,10 @@ #include #include #include +#include +#include #include -#include "src_config.h" -#include "src.h" - #if SRC_GENERIC #if SRC_SHORT /* 16 bit coefficients version */ diff --git a/src/audio/src_hifi2ep.c b/src/audio/src/src_hifi2ep.c similarity index 99% rename from src/audio/src_hifi2ep.c rename to src/audio/src/src_hifi2ep.c index 5217c81f28bc..768d8f695f4b 100644 --- a/src/audio/src_hifi2ep.c +++ b/src/audio/src/src_hifi2ep.c @@ -34,11 +34,10 @@ #include #include #include +#include +#include #include -#include "src_config.h" -#include "src.h" - #if SRC_HIFIEP #include diff --git a/src/audio/src_hifi3.c b/src/audio/src/src_hifi3.c similarity index 99% rename from src/audio/src_hifi3.c rename to src/audio/src/src_hifi3.c index 7e05e0b1ee80..422498d4c892 100644 --- a/src/audio/src_hifi3.c +++ b/src/audio/src/src_hifi3.c @@ -34,11 +34,10 @@ #include #include #include +#include +#include #include -#include "src_config.h" -#include "src.h" - #if SRC_HIFI3 #include diff --git a/src/audio/volume/CMakeLists.txt b/src/audio/volume/CMakeLists.txt new file mode 100644 index 000000000000..1f13bf615294 --- /dev/null +++ b/src/audio/volume/CMakeLists.txt @@ -0,0 +1 @@ +add_local_sources(sof volume_generic.c volume_hifi3.c volume.c) diff --git a/src/audio/volume.c b/src/audio/volume/volume.c similarity index 99% rename from src/audio/volume.c rename to src/audio/volume/volume.c index ce5ef9d2846b..105943565648 100644 --- a/src/audio/volume.c +++ b/src/audio/volume/volume.c @@ -48,7 +48,7 @@ #include #include #include -#include "volume.h" +#include #include /** diff --git a/src/audio/volume_generic.c b/src/audio/volume/volume_generic.c similarity index 99% rename from src/audio/volume_generic.c rename to src/audio/volume/volume_generic.c index 216ea28764d5..8f0602649d53 100644 --- a/src/audio/volume_generic.c +++ b/src/audio/volume/volume_generic.c @@ -38,7 +38,7 @@ * Tomasz Lauda */ -#include "volume.h" +#include #ifdef CONFIG_GENERIC diff --git a/src/audio/volume_hifi3.c b/src/audio/volume/volume_hifi3.c similarity index 99% rename from src/audio/volume_hifi3.c rename to src/audio/volume/volume_hifi3.c index e1d4d76bd553..3c1a800500f4 100644 --- a/src/audio/volume_hifi3.c +++ b/src/audio/volume/volume_hifi3.c @@ -34,7 +34,7 @@ * \authors Tomasz Lauda */ -#include "volume.h" +#include #if defined(__XCC__) && XCHAL_HAVE_HIFI3 diff --git a/src/audio/fir.h b/src/include/sof/audio/eq_fir/fir.h similarity index 99% rename from src/audio/fir.h rename to src/include/sof/audio/eq_fir/fir.h index c52c01b8c78f..24dc71b25659 100644 --- a/src/audio/fir.h +++ b/src/include/sof/audio/eq_fir/fir.h @@ -33,7 +33,7 @@ #ifndef FIR_H #define FIR_H -#include "fir_config.h" +#include #if FIR_GENERIC diff --git a/src/audio/fir_config.h b/src/include/sof/audio/eq_fir/fir_config.h similarity index 100% rename from src/audio/fir_config.h rename to src/include/sof/audio/eq_fir/fir_config.h diff --git a/src/audio/fir_hifi2ep.h b/src/include/sof/audio/eq_fir/fir_hifi2ep.h similarity index 99% rename from src/audio/fir_hifi2ep.h rename to src/include/sof/audio/eq_fir/fir_hifi2ep.h index dfad2177ddbe..6fd02df49338 100644 --- a/src/audio/fir_hifi2ep.h +++ b/src/include/sof/audio/eq_fir/fir_hifi2ep.h @@ -31,7 +31,7 @@ #ifndef FIR_HIFI2EP_H #define FIR_HIFI2EP_H -#include "fir_config.h" +#include #if FIR_HIFIEP diff --git a/src/audio/fir_hifi3.h b/src/include/sof/audio/eq_fir/fir_hifi3.h similarity index 99% rename from src/audio/fir_hifi3.h rename to src/include/sof/audio/eq_fir/fir_hifi3.h index 102c8ff860b8..fabc00a09b5c 100644 --- a/src/audio/fir_hifi3.h +++ b/src/include/sof/audio/eq_fir/fir_hifi3.h @@ -31,7 +31,7 @@ #ifndef FIR_HIFI3_H #define FIR_HIFI3_H -#include "fir_config.h" +#include #if FIR_HIFI3 diff --git a/src/audio/eq_iir.h b/src/include/sof/audio/eq_iir/eq_iir.h similarity index 100% rename from src/audio/eq_iir.h rename to src/include/sof/audio/eq_iir/eq_iir.h diff --git a/src/audio/iir.h b/src/include/sof/audio/eq_iir/iir.h similarity index 100% rename from src/audio/iir.h rename to src/include/sof/audio/eq_iir/iir.h diff --git a/src/audio/selector.h b/src/include/sof/audio/selector.h similarity index 100% rename from src/audio/selector.h rename to src/include/sof/audio/selector.h diff --git a/src/audio/src.h b/src/include/sof/audio/src/src.h similarity index 100% rename from src/audio/src.h rename to src/include/sof/audio/src/src.h diff --git a/src/audio/src_config.h b/src/include/sof/audio/src/src_config.h similarity index 100% rename from src/audio/src_config.h rename to src/include/sof/audio/src/src_config.h diff --git a/src/audio/volume.h b/src/include/sof/audio/volume.h similarity index 100% rename from src/audio/volume.h rename to src/include/sof/audio/volume.h diff --git a/test/cmocka/src/audio/selector/CMakeLists.txt b/test/cmocka/src/audio/selector/CMakeLists.txt index 088d9e7cf3b8..31080dc2ae9d 100644 --- a/test/cmocka/src/audio/selector/CMakeLists.txt +++ b/test/cmocka/src/audio/selector/CMakeLists.txt @@ -7,8 +7,8 @@ target_include_directories(selector_test PRIVATE ${PROJECT_SOURCE_DIR}/src/audio # make small version of libaudio so we don't have to care # about unused missing references add_library(audio_for_selector STATIC - ${PROJECT_SOURCE_DIR}/src/audio/selector.c - ${PROJECT_SOURCE_DIR}/src/audio/selector_generic.c + ${PROJECT_SOURCE_DIR}/src/audio/selector/selector.c + ${PROJECT_SOURCE_DIR}/src/audio/selector/selector_generic.c ) target_link_libraries(audio_for_selector PRIVATE sof_options) diff --git a/test/cmocka/src/audio/selector/selector_test.c b/test/cmocka/src/audio/selector/selector_test.c index 14902d313782..4217218e575d 100644 --- a/test/cmocka/src/audio/selector/selector_test.c +++ b/test/cmocka/src/audio/selector/selector_test.c @@ -34,7 +34,7 @@ #include #include #include -#include "selector.h" +#include struct sel_test_state { diff --git a/test/cmocka/src/audio/volume/CMakeLists.txt b/test/cmocka/src/audio/volume/CMakeLists.txt index e536ce84c8cd..d428386ea1c9 100644 --- a/test/cmocka/src/audio/volume/CMakeLists.txt +++ b/test/cmocka/src/audio/volume/CMakeLists.txt @@ -7,9 +7,9 @@ target_include_directories(volume_process PRIVATE ${PROJECT_SOURCE_DIR}/src/audi # make small version of libaudio so we don't have to care # about unused missing references add_library(audio_for_volume STATIC - ${PROJECT_SOURCE_DIR}/src/audio/volume.c - ${PROJECT_SOURCE_DIR}/src/audio/volume_generic.c - ${PROJECT_SOURCE_DIR}/src/audio/volume_hifi3.c + ${PROJECT_SOURCE_DIR}/src/audio/volume/volume.c + ${PROJECT_SOURCE_DIR}/src/audio/volume/volume_generic.c + ${PROJECT_SOURCE_DIR}/src/audio/volume/volume_hifi3.c ) target_link_libraries(audio_for_volume PRIVATE sof_options) diff --git a/test/cmocka/src/audio/volume/volume_process.c b/test/cmocka/src/audio/volume/volume_process.c index f83ca4d4b0d0..237a27ab030e 100644 --- a/test/cmocka/src/audio/volume/volume_process.c +++ b/test/cmocka/src/audio/volume/volume_process.c @@ -34,7 +34,7 @@ #include #include #include -#include "volume.h" +#include /* Add macro for a volume test level. The levels to test with this code * are: From 525d0e7a5605316e36cb5254aa13ac4a0f5622de Mon Sep 17 00:00:00 2001 From: Tomasz Lauda Date: Wed, 15 May 2019 16:44:03 +0200 Subject: [PATCH 2/4] audio: fix checkpatch errors Fixes checkpatch errors in audio components. Signed-off-by: Tomasz Lauda --- src/audio/eq_fir/eq_fir.c | 7 +++---- src/audio/eq_fir/fir_hifi3.c | 1 - src/audio/eq_iir/eq_iir.c | 10 +++++----- src/audio/selector/selector.c | 15 ++++++--------- src/audio/selector/selector_generic.c | 14 ++++++++------ src/audio/src/src.c | 18 ++++++++++-------- src/audio/volume/volume.c | 14 +++++++------- src/audio/volume/volume_generic.c | 1 - src/include/sof/audio/selector.h | 3 +-- src/include/sof/audio/volume.h | 17 ++++++++++------- 10 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c index fc419dee3965..d387c61557fc 100644 --- a/src/audio/eq_fir/eq_fir.c +++ b/src/audio/eq_fir/eq_fir.c @@ -356,9 +356,8 @@ static int eq_fir_setup(struct comp_data *cd, int nch) fir_delay = cd->fir_delay; for (i = 0; i < nch; i++) { resp = assign_response[i]; - if (resp >= 0) { + if (resp >= 0) fir_init_delay(&fir[i], &fir_delay); - } } return 0; @@ -415,8 +414,8 @@ static struct comp_dev *eq_fir_new(struct sof_ipc_comp *comp) return NULL; fir = (struct sof_ipc_comp_process *)&dev->comp; - assert(!memcpy_s(fir, sizeof(*fir), - ipc_fir, sizeof(struct sof_ipc_comp_process))); + assert(!memcpy_s(fir, sizeof(*fir), ipc_fir, + sizeof(struct sof_ipc_comp_process))); cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (!cd) { diff --git a/src/audio/eq_fir/fir_hifi3.c b/src/audio/eq_fir/fir_hifi3.c index 24f97e2aa63c..ebb219da7fdd 100644 --- a/src/audio/eq_fir/fir_hifi3.c +++ b/src/audio/eq_fir/fir_hifi3.c @@ -226,7 +226,6 @@ void eq_fir_2x_s24_hifi3(struct fir_state_32x16 fir[], AE_S32_L_XC(d0, y0, inc_2nch_s); AE_S32_L_XC(d1, y1, inc_2nch_s); } - } } diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c index 92a58a06d48b..617dc30a9d50 100644 --- a/src/audio/eq_iir/eq_iir.c +++ b/src/audio/eq_iir/eq_iir.c @@ -509,8 +509,8 @@ static struct comp_dev *eq_iir_new(struct sof_ipc_comp *comp) return NULL; iir = (struct sof_ipc_comp_process *)&dev->comp; - assert(!memcpy_s(iir, sizeof(*iir), - ipc_iir, sizeof(struct sof_ipc_comp_process))); + assert(!memcpy_s(iir, sizeof(*iir), ipc_iir, + sizeof(struct sof_ipc_comp_process))); cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (!cd) { @@ -588,8 +588,9 @@ static int iir_cmd_get_data(struct comp_dev *dev, bs > max_size) return -EINVAL; assert(!memcpy_s(cdata->data->data, - ((struct sof_abi_hdr *) - (cdata->data))->size, cd->config, bs)); + ((struct sof_abi_hdr *) + (cdata->data))->size, cd->config, + bs)); cdata->data->abi = SOF_ABI_VERSION; cdata->data->size = bs; @@ -923,7 +924,6 @@ struct comp_driver comp_eq_iir = { }, }; - static void sys_comp_eq_iir_init(void) { comp_register(&comp_eq_iir); diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c index 0f366065267b..01c76e4bc9be 100644 --- a/src/audio/selector/selector.c +++ b/src/audio/selector/selector.c @@ -32,7 +32,7 @@ * \file audio/selector.c * \brief Audio channel selection component. In case 1 output channel is * \brief selected in topology the component provides the selected channel on - * \brief ouput. In case 2 or 4 channels are selected on output the component + * \brief output. In case 2 or 4 channels are selected on output the component * \brief works in a passthrough mode. * \authors Lech Betlej */ @@ -186,7 +186,6 @@ static int selector_params(struct comp_dev *dev) return PPL_STATUS_PATH_STOP; } - /** * \brief Sets selector control command. * \param[in,out] dev Selector base component device. @@ -201,13 +200,14 @@ static int selector_ctrl_set_data(struct comp_dev *dev, int ret = 0; switch (cdata->cmd) { - case SOF_CTRL_CMD_BINARY: + case SOF_CTRL_CMD_BINARY: trace_selector("selector_ctrl_set_data(), SOF_CTRL_CMD_BINARY"); cfg = (struct sof_sel_config *)cdata->data->data; /* Just copy the configuration & verify input params.*/ ret = sel_set_channel_values(cd, cfg->in_channels_count, - cfg->out_channels_count, cfg->sel_channel); + cfg->out_channels_count, + cfg->sel_channel); break; default: trace_selector_error("selector_ctrl_set_cmd() error: " @@ -239,10 +239,8 @@ static int selector_ctrl_get_data(struct comp_dev *dev, /* Copy back to user space */ assert(!memcpy_s(cdata->data->data, ((struct sof_abi_hdr *) - (cdata->data))->size, &(cd->config), - sizeof(cd->config))); - if (ret < 0) - return ret; + (cdata->data))->size, &cd->config, + sizeof(cd->config))); cdata->data->abi = SOF_ABI_VERSION; cdata->data->size = sizeof(cd->config); @@ -310,7 +308,6 @@ static int selector_trigger(struct comp_dev *dev, int cmd) return ret == 0 ? PPL_STATUS_PATH_STOP : ret; } - /** * \brief Copies and processes stream data. * \param[in,out] dev Selector base component device. diff --git a/src/audio/selector/selector_generic.c b/src/audio/selector/selector_generic.c index f296175e182d..0f8f3c01e935 100644 --- a/src/audio/selector/selector_generic.c +++ b/src/audio/selector/selector_generic.c @@ -36,7 +36,7 @@ #include -/** +/** * \brief Channel selection for 16 bit, 1 channel data format. * \param[in,out] dev Selector base component device. * \param[in,out] sink Destination buffer. @@ -60,7 +60,7 @@ static void sel_s16le_1ch(struct comp_dev *dev, struct comp_buffer *sink, } } -/** +/** * \brief Channel selection for 32 bit, 1 channel data format. * \param[in,out] dev Selector base component device. * \param[in,out] sink Destination buffer. @@ -84,7 +84,7 @@ static void sel_s32le_1ch(struct comp_dev *dev, struct comp_buffer *sink, } } -/** +/** * \brief Channel selection for 16 bit, at least 2 channels data format. * \param[in,out] dev Selector base component device. * \param[in,out] sink Destination buffer. @@ -102,7 +102,8 @@ static void sel_s16le_nch(struct comp_dev *dev, struct comp_buffer *sink, uint32_t channel; for (i = 0; i < frames; i++) { - for (channel = 0; channel < cd->config.in_channels_count; channel++) { + for (channel = 0; channel < cd->config.in_channels_count; + channel++) { src = buffer_read_frag_s16(source, j); dest = buffer_write_frag_s16(sink, j); *dest = *src; @@ -111,7 +112,7 @@ static void sel_s16le_nch(struct comp_dev *dev, struct comp_buffer *sink, } } -/** +/** * \brief Channel selection for 32 bit, at least 2 channels data format. * \param[in,out] dev Selector base component device. * \param[in,out] sink Destination buffer. @@ -129,7 +130,8 @@ static void sel_s32le_nch(struct comp_dev *dev, struct comp_buffer *sink, uint32_t channel; for (i = 0; i < frames; i++) { - for (channel = 0; channel < cd->config.in_channels_count; channel++) { + for (channel = 0; channel < cd->config.in_channels_count; + channel++) { src = buffer_read_frag_s32(source, j); dest = buffer_write_frag_s32(sink, j); *dest = *src; diff --git a/src/audio/src/src.c b/src/audio/src/src.c index 310bf06036a7..d6c3cf96d9ec 100644 --- a/src/audio/src/src.c +++ b/src/audio/src/src.c @@ -60,9 +60,12 @@ #include #endif -#define trace_src(__e, ...) trace_event(TRACE_CLASS_SRC, __e, ##__VA_ARGS__) -#define tracev_src(__e, ...) tracev_event(TRACE_CLASS_SRC, __e, ##__VA_ARGS__) -#define trace_src_error(__e, ...) trace_error(TRACE_CLASS_SRC, __e, ##__VA_ARGS__) +#define trace_src(__e, ...) \ + trace_event(TRACE_CLASS_SRC, __e, ##__VA_ARGS__) +#define tracev_src(__e, ...) \ + tracev_event(TRACE_CLASS_SRC, __e, ##__VA_ARGS__) +#define trace_src_error(__e, ...) \ + trace_error(TRACE_CLASS_SRC, __e, ##__VA_ARGS__) /* The FIR maximum lengths are per channel so need to multiply them */ #define MAX_FIR_DELAY_SIZE_XNCH (PLATFORM_MAX_CHANNELS * MAX_FIR_DELAY_SIZE) @@ -539,7 +542,7 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) src = (struct sof_ipc_comp_src *)&dev->comp; assert(!memcpy_s(src, sizeof(*src), ipc_src, - sizeof(struct sof_ipc_comp_src))); + sizeof(struct sof_ipc_comp_src))); cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (!cd) { @@ -616,8 +619,8 @@ static int src_params(struct comp_dev *dev) err = src_buffer_lengths(&cd->param, cd->source_rate, cd->sink_rate, params->channels, cd->source_frames); if (err < 0) { - trace_src_error( - "src_params() error: src_buffer_lengths() failed"); + trace_src_error("src_params() error: src_buffer_lengths() " + "failed"); return err; } @@ -844,9 +847,8 @@ static int src_prepare(struct comp_dev *dev) * data. Change it to 16 bit version here if source and sink * rates are equal. */ - if (cd->source_rate == cd->sink_rate) { + if (cd->source_rate == cd->sink_rate) cd->src_func = src_copy_s16; - } break; case SOF_IPC_FRAME_S24_4LE: cd->data_shift = 8; diff --git a/src/audio/volume/volume.c b/src/audio/volume/volume.c index 105943565648..f936b65141db 100644 --- a/src/audio/volume/volume.c +++ b/src/audio/volume/volume.c @@ -96,7 +96,6 @@ static uint64_t vol_work(void *data) /* inc/dec each volume if it's not at target */ for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - /* skip if target reached */ if (cd->volume[i] == cd->tvolume[i]) continue; @@ -164,13 +163,13 @@ static struct comp_dev *volume_new(struct sof_ipc_comp *comp) } dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, - COMP_SIZE(struct sof_ipc_comp_volume)); + COMP_SIZE(struct sof_ipc_comp_volume)); if (!dev) return NULL; vol = (struct sof_ipc_comp_volume *)&dev->comp; assert(!memcpy_s(vol, sizeof(*vol), ipc_vol, - sizeof(struct sof_ipc_comp_volume))); + sizeof(struct sof_ipc_comp_volume))); cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (!cd) { @@ -358,9 +357,10 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, trace_volume("volume_ctrl_set_cmd(), " "SOF_CTRL_CMD_VOLUME, " "channel = %u, value = %u", - cdata->chanv[j].channel, cdata->chanv[j].value); + cdata->chanv[j].channel, + cdata->chanv[j].value); i = cdata->chanv[j].channel; - if ((i >= 0) && (i < SOF_IPC_MAX_CHANNELS)) { + if (i >= 0 && i < SOF_IPC_MAX_CHANNELS) { ret = volume_set_chan(dev, i, cdata->chanv[j].value); } else { @@ -371,7 +371,6 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, } if (ret) return ret; - } schedule_task(&cd->volwork, VOL_RAMP_UPDATE_US, 0, 0); @@ -387,7 +386,7 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, cdata->chanv[j].channel, cdata->chanv[j].value); i = cdata->chanv[j].channel; - if ((i >= 0) && (i < SOF_IPC_MAX_CHANNELS)) { + if (i >= 0 && i < SOF_IPC_MAX_CHANNELS) { if (cdata->chanv[j].value) volume_set_chan_unmute(dev, i); else @@ -399,6 +398,7 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, "invalid i = %u", i); } } + schedule_task(&cd->volwork, VOL_RAMP_UPDATE_US, 0, 0); break; diff --git a/src/audio/volume/volume_generic.c b/src/audio/volume/volume_generic.c index 8f0602649d53..6db05153f40c 100644 --- a/src/audio/volume/volume_generic.c +++ b/src/audio/volume/volume_generic.c @@ -139,7 +139,6 @@ static void vol_s16_to_s32(struct comp_dev *dev, struct comp_buffer *sink, (*src << 8, cd->volume[channel], Q_SHIFT_BITS_64(23, 16, 31)); - buff_frag++; } } diff --git a/src/include/sof/audio/selector.h b/src/include/sof/audio/selector.h index e7c162f08386..d7e57d264cd7 100644 --- a/src/include/sof/audio/selector.h +++ b/src/include/sof/audio/selector.h @@ -74,7 +74,6 @@ struct sof_sel_config { uint32_t sel_channel; /**< 0..3 */ }; - /** \brief Selector component private data. */ struct comp_data { uint32_t source_period_bytes; /**< source number of period bytes */ @@ -84,7 +83,7 @@ struct comp_data { struct sof_sel_config config; /**< component configuration data */ /**< channel selector processing function */ void (*sel_func)(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames); + struct comp_buffer *source, uint32_t frames); }; /** \brief Selector processing functions map. */ diff --git a/src/include/sof/audio/volume.h b/src/include/sof/audio/volume.h index f25607c3b0f2..6c5c8da28e2e 100644 --- a/src/include/sof/audio/volume.h +++ b/src/include/sof/audio/volume.h @@ -56,13 +56,16 @@ #endif /** \brief Volume trace function. */ -#define trace_volume(__e, ...) trace_event(TRACE_CLASS_VOLUME, __e, ##__VA_ARGS__) +#define trace_volume(__e, ...) \ + trace_event(TRACE_CLASS_VOLUME, __e, ##__VA_ARGS__) /** \brief Volume trace value function. */ -#define tracev_volume(__e, ...) tracev_event(TRACE_CLASS_VOLUME, __e, ##__VA_ARGS__) +#define tracev_volume(__e, ...) \ + tracev_event(TRACE_CLASS_VOLUME, __e, ##__VA_ARGS__) /** \brief Volume trace error function. */ -#define trace_volume_error(__e, ...) trace_error(TRACE_CLASS_VOLUME, __e, ##__VA_ARGS__) +#define trace_volume_error(__e, ...) \ + trace_error(TRACE_CLASS_VOLUME, __e, ##__VA_ARGS__) //** \brief Volume gain Qx.y integer x number of bits including sign bit. */ #define VOL_QXY_X 8 @@ -94,7 +97,7 @@ #define VOL_MAX ((1 << (VOL_QXY_X + VOL_QXY_Y - 1)) - 1) /** \brief Volume 0dB value. */ -#define VOL_ZERO_DB (1 << VOL_QXY_Y) +#define VOL_ZERO_DB BIT(VOL_QXY_Y) /** \brief Volume minimum value. */ #define VOL_MIN 0 @@ -112,7 +115,7 @@ struct comp_data { int32_t mvolume[SOF_IPC_MAX_CHANNELS]; /**< mute volume */ /**< volume processing function */ void (*scale_vol)(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames); + struct comp_buffer *source, uint32_t frames); struct task volwork; /**< volume scheduled work function */ struct sof_ipc_ctrl_value_chan *hvol; /**< host volume readback */ int32_t ramp_increment[SOF_IPC_MAX_CHANNELS]; /**< for linear ramp */ @@ -124,7 +127,7 @@ struct comp_func_map { uint16_t sink; /**< sink frame format */ /**< volume processing function */ void (*func)(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames); + struct comp_buffer *source, uint32_t frames); }; /** \brief Map of formats with dedicated processing functions. */ @@ -140,7 +143,7 @@ typedef void (*scale_vol)(struct comp_dev *, struct comp_buffer *, * \brief Retrievies volume processing function. * \param[in,out] dev Volume base component device. */ -inline static scale_vol vol_get_processing_function(struct comp_dev *dev) +static inline scale_vol vol_get_processing_function(struct comp_dev *dev) { struct comp_data *cd = comp_get_drvdata(dev); int i; From 4e1bd2c70670c34819c9c72cf74f0707371f64b3 Mon Sep 17 00:00:00 2001 From: Tomasz Lauda Date: Thu, 16 May 2019 11:06:18 +0200 Subject: [PATCH 3/4] audio: replace memcpy with memcpy_s Replaces memcpy calls with memcpy_s calls in audio processing components. Signed-off-by: Tomasz Lauda --- src/audio/eq_fir/eq_fir.c | 8 ++++++-- src/audio/selector/selector.c | 6 ++++-- src/audio/src/src.c | 6 ++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c index d387c61557fc..41b28697884c 100644 --- a/src/audio/eq_fir/eq_fir.c +++ b/src/audio/eq_fir/eq_fir.c @@ -507,7 +507,9 @@ static int fir_cmd_get_data(struct comp_dev *dev, trace_eq("fir_cmd_get_data(), blob size %zu " "msg index %u max size %u offset %zu", bs, cdata->msg_index, max_size, offset); - memcpy(dst, src + offset, bs); + assert(!memcpy_s(dst, ((struct sof_abi_hdr *) + (cdata->data))->size, src + offset, + bs)); cdata->data->abi = SOF_ABI_VERSION; cdata->data->size = bs; } else { @@ -612,7 +614,9 @@ static int fir_cmd_set_data(struct comp_dev *dev, /* Just copy the configuration. The EQ will be initialized in * prepare(). */ - memcpy(dst + offset, src, cdata->num_elems); + assert(!memcpy_s(dst + offset, cdata->num_elems + + cdata->elems_remaining - offset, src, + cdata->num_elems)); /* we can check data when elems_remaining == 0 */ break; diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c index 01c76e4bc9be..6ba7b953489c 100644 --- a/src/audio/selector/selector.c +++ b/src/audio/selector/selector.c @@ -124,7 +124,8 @@ static struct comp_dev *selector_new(struct sof_ipc_comp *comp) if (!dev) return NULL; - memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_process)); + assert(!memcpy_s(&dev->comp, sizeof(struct sof_ipc_comp_process), comp, + sizeof(struct sof_ipc_comp_process))); cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (!cd) { @@ -134,7 +135,8 @@ static struct comp_dev *selector_new(struct sof_ipc_comp *comp) comp_set_drvdata(dev, cd); - memcpy(&cd->config, ipc_process->data, bs); + assert(!memcpy_s(&cd->config, sizeof(cd->config), ipc_process->data, + bs)); /* verification of initial parameters */ ret = sel_set_channel_values(cd, cd->config.in_channels_count, diff --git a/src/audio/src/src.c b/src/audio/src/src.c index d6c3cf96d9ec..8991b944904b 100644 --- a/src/audio/src/src.c +++ b/src/audio/src/src.c @@ -466,7 +466,8 @@ static void src_copy_s32(struct comp_dev *dev, n_wrap_min = (n_wrap_src < n_wrap_snk) ? n_wrap_src : n_wrap_snk; n_copy = (n < n_wrap_min) ? n : n_wrap_min; - memcpy(snk, src, n_copy * sizeof(int32_t)); + assert(!memcpy_s(snk, n_copy * sizeof(int32_t), src, + n_copy * sizeof(int32_t))); /* Update and check both source and destination for wrap */ n -= n_copy; @@ -500,7 +501,8 @@ static void src_copy_s16(struct comp_dev *dev, n_wrap_min = (n_wrap_src < n_wrap_snk) ? n_wrap_src : n_wrap_snk; n_copy = (n < n_wrap_min) ? n : n_wrap_min; - memcpy(snk, src, n_copy * sizeof(int16_t)); + assert(!memcpy_s(snk, n_copy * sizeof(int16_t), src, + n_copy * sizeof(int16_t))); /* Update and check both source and destination for wrap */ n -= n_copy; From f2b5f586a8fb0686a6f6adddcebacf6719832b99 Mon Sep 17 00:00:00 2001 From: Tomasz Lauda Date: Wed, 15 May 2019 16:48:28 +0200 Subject: [PATCH 4/4] audio: remove checking for MODULE_TEST Removes preprocessor checks for MODULE_TEST. It was used by testbench, when the FW traces were very limited. It's no longer needed. Signed-off-by: Tomasz Lauda --- src/audio/eq_fir/eq_fir.c | 4 -- src/audio/eq_iir/eq_iir.c | 4 -- src/audio/eq_iir/iir.c | 5 --- src/audio/src/src.c | 4 -- src/audio/tone.c | 9 ---- src/drivers/intel/cavs/dmic.c | 85 ----------------------------------- 6 files changed, 111 deletions(-) diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c index 41b28697884c..c711a8fef01c 100644 --- a/src/audio/eq_fir/eq_fir.c +++ b/src/audio/eq_fir/eq_fir.c @@ -49,10 +49,6 @@ #include #endif -#ifdef MODULE_TEST -#include -#endif - #define trace_eq(__e, ...) trace_event(TRACE_CLASS_EQ_FIR, __e, ##__VA_ARGS__) #define tracev_eq(__e, ...) tracev_event(TRACE_CLASS_EQ_FIR, __e, ##__VA_ARGS__) #define trace_eq_error(__e, ...) \ diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c index 617dc30a9d50..4a4f73e42f17 100644 --- a/src/audio/eq_iir/eq_iir.c +++ b/src/audio/eq_iir/eq_iir.c @@ -45,10 +45,6 @@ #include #include -#ifdef MODULE_TEST -#include -#endif - #define trace_eq(__e, ...) trace_event(TRACE_CLASS_EQ_IIR, __e, ##__VA_ARGS__) #define tracev_eq(__e, ...) tracev_event(TRACE_CLASS_EQ_IIR, __e, ##__VA_ARGS__) #define trace_eq_error(__e, ...) \ diff --git a/src/audio/eq_iir/iir.c b/src/audio/eq_iir/iir.c index 183c24f27245..d76cf741511e 100644 --- a/src/audio/eq_iir/iir.c +++ b/src/audio/eq_iir/iir.c @@ -33,11 +33,6 @@ #include #include #include - -#ifdef MODULE_TEST -#include -#endif - #include #include #include diff --git a/src/audio/src/src.c b/src/audio/src/src.c index 8991b944904b..4c8f892d09da 100644 --- a/src/audio/src/src.c +++ b/src/audio/src/src.c @@ -56,10 +56,6 @@ #include #endif -#ifdef MODULE_TEST -#include -#endif - #define trace_src(__e, ...) \ trace_event(TRACE_CLASS_SRC, __e, ##__VA_ARGS__) #define tracev_src(__e, ...) \ diff --git a/src/audio/tone.c b/src/audio/tone.c index 55a3caec40d5..a498bee0fb81 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -49,10 +49,6 @@ #include #include -#ifdef MODULE_TEST -#include -#endif - #define trace_tone(__e, ...) trace_event(TRACE_CLASS_TONE, __e, ##__VA_ARGS__) #define tracev_tone(__e, ...) tracev_event(TRACE_CLASS_TONE, __e, ##__VA_ARGS__) #define trace_tone_error(__e, ...) trace_error(TRACE_CLASS_TONE, __e, ##__VA_ARGS__) @@ -324,11 +320,6 @@ static void tonegen_update_f(struct tone_state *sg, int32_t f) w_tmp = q_multsr_32x32(sg->f, sg->c, Q_SHIFT_BITS_64(16, 31, 28)); w_tmp = (w_tmp > PI_Q4_28) ? PI_Q4_28 : w_tmp; /* Limit to pi Q4.28 */ sg->w_step = (int32_t)w_tmp; - -#ifdef MODULE_TEST - printf("Fs=%d, f_max=%d, f_new=%.3f\n", - sg->fs, (int32_t)(f_max >> 16), sg->f / 65536.0); -#endif } static void tonegen_reset(struct tone_state *sg) diff --git a/src/drivers/intel/cavs/dmic.c b/src/drivers/intel/cavs/dmic.c index 2b7d9354365b..ecb103a1675f 100644 --- a/src/drivers/intel/cavs/dmic.c +++ b/src/drivers/intel/cavs/dmic.c @@ -39,10 +39,6 @@ #include -#if defined MODULE_TEST -#include -#endif - #define DMIC_MAX_MODES 50 /* HW FIR pipeline needs 5 additional cycles per channel for internal @@ -149,42 +145,6 @@ static const uint32_t coef_base_b[4] = {PDM0_COEFFICIENT_B, PDM1_COEFFICIENT_B, static struct sof_ipc_dai_dmic_params *dmic_prm[DMIC_HW_FIFOS]; static int dmic_active_fifos; -#if defined MODULE_TEST -#define IO_BYTES_GLOBAL (PDM0 - OUTCONTROL0) -#define IO_BYTES_MIDDLE (PDM1 - PDM0) -#define IO_BYTES_LAST (PDM0_COEFFICIENT_B + PDM_COEF_RAM_B_LENGTH - PDM0) -#define IO_BYTES (((DMIC_HW_CONTROLLERS) - 1) * (IO_BYTES_MIDDLE) \ - + (IO_BYTES_LAST) + (IO_BYTES_GLOBAL)) -#define IO_LENGTH ((IO_BYTES) >> 2) - -static uint32_t dmic_io[IO_LENGTH]; - -static void dmic_write(struct dai *dai, uint32_t reg, uint32_t value) -{ - printf("W %04x %08x\n", reg, value); - dmic_io[reg >> 2] = value; -} - -static uint32_t dmic_read(struct dai *dai, uint32_t reg) -{ - uint32_t value = dmic_io[reg >> 2]; - - printf("R %04x %08x\n", reg, value); - return value; -} - -static void dmic_update_bits(struct dai *dai, uint32_t reg, uint32_t mask, - uint32_t value) -{ - uint32_t new_value; - uint32_t old_value = dmic_io[reg >> 2]; - - new_value = (old_value & (~mask)) | value; - dmic_io[reg >> 2] = new_value; - printf("W %04x %08x\n", reg, new_value); -} -#else - static void dmic_write(struct dai *dai, uint32_t reg, uint32_t value) { io_reg_write(dai_base(dai) + reg, value); @@ -200,7 +160,6 @@ static void dmic_update_bits(struct dai *dai, uint32_t reg, uint32_t mask, { io_reg_update_bits(dai_base(dai) + reg, mask, value); } -#endif /* this ramps volume changes over time */ static uint64_t dmic_work(void *data) @@ -406,10 +365,6 @@ static void find_modes(struct decim_modes *modes, uint32_t fs, int di) } modes->num_of_modes = i; - -#if defined MODULE_TEST - printf("# Found %d modes\n", i); -#endif } /* The previous raw modes list contains sane configuration possibilities. When @@ -569,20 +524,6 @@ static int fir_coef_scale(int32_t *fir_scale, int *fir_shift, int add_shift, else *fir_scale = (fir_gain >> shift); -#if defined MODULE_TEST - printf("# FIR gain need Q28 = %d (%f)\n", fir_gain, - Q_CONVERT_QTOF(fir_gain, 28)); - printf("# FIR max coef no gain Q31 = %d (%f)\n", amax, - Q_CONVERT_QTOF(amax, 31)); - printf("# FIR max coef with gain Q28 = %d (%f)\n", new_amax, - Q_CONVERT_QTOF(new_amax, 28)); - printf("# FIR coef norm rshift = %d\n", shift); - printf("# FIR coef old rshift = %d\n", add_shift); - printf("# FIR coef new rshift = %d\n", *fir_shift); - printf("# FIR coef scaler Q28 = %d (%f)\n", *fir_scale, - Q_CONVERT_QTOF(*fir_scale, 28)); -#endif - return 0; } @@ -876,13 +817,6 @@ static int configure_registers(struct dai *dai, int source[4] = {0, 0, 0, 0}; #endif -#if defined MODULE_TEST - int32_t fir_a_max = 0; - int32_t fir_a_min = 0; - int32_t fir_b_max = 0; - int32_t fir_b_min = 0; -#endif - /* pdata is set by dmic_probe(), error if it has not been set */ if (!pdata) { trace_dmic_error("configure_registers() error: pdata not set"); @@ -1074,10 +1008,6 @@ static int configure_registers(struct dai *dai, cu = FIR_COEF_A(ci); dmic_write(dai, coef_base_a[i] + ((length - j - 1) << 2), cu); -#if defined MODULE_TEST - fir_a_max = MAX(fir_a_max, ci); - fir_a_min = MIN(fir_a_min, ci); -#endif } /* Write coef RAM B with scaled coefficient in reverse order */ @@ -1089,24 +1019,9 @@ static int configure_registers(struct dai *dai, cu = FIR_COEF_B(ci); dmic_write(dai, coef_base_b[i] + ((length - j - 1) << 2), cu); -#if defined MODULE_TEST - fir_b_max = MAX(fir_b_max, ci); - fir_b_min = MIN(fir_b_min, ci); -#endif } } -#if defined MODULE_TEST - printf("# FIR A max Q19 = %d (%f)\n", fir_a_max, - Q_CONVERT_QTOF(fir_a_max, 19)); - printf("# FIR A min Q19 = %d (%f)\n", fir_a_min, - Q_CONVERT_QTOF(fir_a_min, 19)); - printf("# FIR B max Q19 = %d (%f)\n", fir_b_max, - Q_CONVERT_QTOF(fir_b_max, 19)); - printf("# FIR B min Q19 = %d (%f)\n", fir_b_min, - Q_CONVERT_QTOF(fir_b_min, 19)); -#endif - return 0; }