From f3ed25ac85a8c17e994ae346d9dc746e2f7a6312 Mon Sep 17 00:00:00 2001 From: Iuliana Prodan Date: Fri, 28 Apr 2023 05:05:25 +0300 Subject: [PATCH 1/2] ASRC: Update parameter type to match the header Update parameter type for asrc_initialise() to match those from header file. This fixes "error: conflicting types for 'asrc_initialise'". Signed-off-by: Iuliana Prodan --- src/audio/asrc/asrc_farrow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/asrc/asrc_farrow.c b/src/audio/asrc/asrc_farrow.c index 3bc51dc2ca55..039b4afe3122 100644 --- a/src/audio/asrc/asrc_farrow.c +++ b/src/audio/asrc/asrc_farrow.c @@ -274,8 +274,8 @@ enum asrc_error_code asrc_get_required_size(struct comp_dev *dev, enum asrc_error_code asrc_initialise(struct comp_dev *dev, struct asrc_farrow *src_obj, int num_channels, - int fs_prim, - int fs_sec, + int32_t fs_prim, + int32_t fs_sec, enum asrc_io_format input_format, enum asrc_io_format output_format, enum asrc_buffer_mode buffer_mode, From 9a30e55964f7e8336cb194ac7ee376c274551dc3 Mon Sep 17 00:00:00 2001 From: Iuliana Prodan Date: Fri, 28 Apr 2023 05:12:29 +0300 Subject: [PATCH 2/2] hal: Update parameter type to match xtensa/hal.h Update parameter type for _xt_atomic_compare_exchange_4() to match xthal_compare_and_set() from xtensa/hal.h This fixes "error: passing argument 1 of 'xthal_compare_and_set' from incompatible pointer type" Signed-off-by: Iuliana Prodan --- src/arch/xtensa/hal/atomics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/xtensa/hal/atomics.c b/src/arch/xtensa/hal/atomics.c index 01a2c9f6508b..d7abc128f966 100644 --- a/src/arch/xtensa/hal/atomics.c +++ b/src/arch/xtensa/hal/atomics.c @@ -3,9 +3,9 @@ #include #include -int _xt_atomic_compare_exchange_4(int32_t *address, int32_t test_value, int32_t set_value); +int _xt_atomic_compare_exchange_4(int *address, int32_t test_value, int32_t set_value); -int _xt_atomic_compare_exchange_4(int32_t *address, int32_t test_value, int32_t set_value) +int _xt_atomic_compare_exchange_4(int *address, int32_t test_value, int32_t set_value) { return xthal_compare_and_set(address, test_value, set_value); }