diff --git a/src/include/sof/audio/coefficients/up_down_mixer/up_down_mixer.h b/src/audio/up_down_mixer/coef/up_down_mixer.h similarity index 99% rename from src/include/sof/audio/coefficients/up_down_mixer/up_down_mixer.h rename to src/audio/up_down_mixer/coef/up_down_mixer.h index ed6730502a79..3688f0dd4833 100644 --- a/src/include/sof/audio/coefficients/up_down_mixer/up_down_mixer.h +++ b/src/audio/up_down_mixer/coef/up_down_mixer.h @@ -5,7 +5,7 @@ // Author: Bartosz Kokoszko // Author: Adrian Bonislawski -#include +#include "../up_down_mixer_ipc4.h" #include #if CONFIG_COMP_UP_DOWN_MIXER diff --git a/src/audio/up_down_mixer/up_down_mixer.c b/src/audio/up_down_mixer/up_down_mixer.c index c6e6c6b5bd58..d72538e80308 100644 --- a/src/audio/up_down_mixer/up_down_mixer.c +++ b/src/audio/up_down_mixer/up_down_mixer.c @@ -5,8 +5,6 @@ // Author: Bartosz Kokoszko // Author: Adrian Bonislawski -#include -#include #include #include #include @@ -28,6 +26,9 @@ #include #include +#include "coef/up_down_mixer.h" +#include "up_down_mixer.h" + LOG_MODULE_REGISTER(up_down_mixer, CONFIG_SOF_LOG_LEVEL); /* these ids aligns windows driver requirement to support windows driver */ diff --git a/src/include/sof/audio/up_down_mixer/up_down_mixer.h b/src/audio/up_down_mixer/up_down_mixer.h similarity index 99% rename from src/include/sof/audio/up_down_mixer/up_down_mixer.h rename to src/audio/up_down_mixer/up_down_mixer.h index 3542b6d1acf5..52a5f1e34daa 100644 --- a/src/include/sof/audio/up_down_mixer/up_down_mixer.h +++ b/src/audio/up_down_mixer/up_down_mixer.h @@ -12,12 +12,13 @@ #include #include #include -#include #include #include #include #include +#include "up_down_mixer_ipc4.h" + /** This type is introduced for better readability. */ typedef const int32_t *downmix_coefficients; diff --git a/src/audio/up_down_mixer/up_down_mixer_hifi3.c b/src/audio/up_down_mixer/up_down_mixer_hifi3.c index db40a71ab5c1..259cf5128b9f 100644 --- a/src/audio/up_down_mixer/up_down_mixer_hifi3.c +++ b/src/audio/up_down_mixer/up_down_mixer_hifi3.c @@ -4,7 +4,7 @@ // // Author: Bartosz Kokoszko -#include +#include "up_down_mixer.h" #if defined(__XCC__) && XCHAL_HAVE_HIFI3 diff --git a/src/include/ipc4/up_down_mixer.h b/src/audio/up_down_mixer/up_down_mixer_ipc4.h similarity index 98% rename from src/include/ipc4/up_down_mixer.h rename to src/audio/up_down_mixer/up_down_mixer_ipc4.h index afd913b6c0d6..5300f5cb71d4 100644 --- a/src/include/ipc4/up_down_mixer.h +++ b/src/audio/up_down_mixer/up_down_mixer_ipc4.h @@ -7,7 +7,7 @@ #ifndef __SOF_IPC4_UP_DOWN_MIXER_H__ #define __SOF_IPC4_UP_DOWN_MIXER_H__ -#include "base-config.h" +#include /** * \brief bits field map which helps to describe each channel location a the data stream buffer