Skip to content

Commit f18e700

Browse files
committed
module_adapter: Fix compilation error with Xtensa toolchain
We get the following error using Xtensa toolchain on i.MX: src/audio/module_adapter/module_adapter.c: In function ‘module_adapter_sink_src_prepare’: src/audio/module_adapter/module_adapter.c:207: error: ‘for’ loop initial declaration used outside C99 mode src/audio/module_adapter/module_adapter.c:211: error: redefinition of ‘i’ src/audio/module_adapter/module_adapter.c:207: error: previous definition of ‘i’ was here src/audio/module_adapter/module_adapter.c:211: error: ‘for’ loop initial declaration used outside C99 mode Fix this by declaring `i` at the top of the function. Fixes: fa77edf ("pipeline2.0: change module prepare API to use sink/src.c") Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
1 parent 89660c6 commit f18e700

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/audio/module_adapter/module_adapter.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static int module_adapter_sink_src_prepare(struct comp_dev *dev)
175175
struct list_item *blist;
176176
uint32_t num_of_sources = 0;
177177
uint32_t num_of_sinks = 0;
178-
int ret;
178+
int ret, i;
179179

180180
/* acquire all sink and source buffers, get handlers to sink/source API */
181181
list_for_item(blist, &dev->bsink_list) {
@@ -204,11 +204,11 @@ static int module_adapter_sink_src_prepare(struct comp_dev *dev)
204204
ret = module_prepare(mod, audio_src, num_of_sources, audio_sink, num_of_sinks);
205205

206206
/* release all source buffers in reverse order */
207-
for (int i = num_of_sources - 1; i >= 0; i--)
207+
for (i = num_of_sources - 1; i >= 0; i--)
208208
buffer_release(source_buffers_c[i]);
209209

210210
/* release all sink buffers in reverse order */
211-
for (int i = num_of_sinks - 1; i >= 0 ; i--)
211+
for (i = num_of_sinks - 1; i >= 0 ; i--)
212212
buffer_release(sinks_buffers_c[i]);
213213

214214
return ret;
@@ -911,7 +911,7 @@ static int module_adapter_sink_source_copy(struct comp_dev *dev)
911911
struct list_item *blist;
912912
uint32_t num_of_sources = 0;
913913
uint32_t num_of_sinks = 0;
914-
int ret;
914+
int ret, i;
915915

916916
comp_dbg(dev, "module_adapter_sink_source_copy(): start");
917917

@@ -946,13 +946,13 @@ static int module_adapter_sink_source_copy(struct comp_dev *dev)
946946
}
947947

948948
/* release all source buffers in reverse order */
949-
for (int i = num_of_sources - 1; i >= 0; i--) {
949+
for (i = num_of_sources - 1; i >= 0; i--) {
950950
mod->total_data_consumed += source_get_num_of_processed_bytes(audio_src[i]);
951951
buffer_release(source_buffers_c[i]);
952952
}
953953

954954
/* release all sink buffers in reverse order */
955-
for (int i = num_of_sinks - 1; i >= 0 ; i--) {
955+
for (i = num_of_sinks - 1; i >= 0 ; i--) {
956956
mod->total_data_produced += sink_get_num_of_processed_bytes(audio_sink[i]);
957957
buffer_release(sinks_buffers_c[i]);
958958
}

0 commit comments

Comments
 (0)