Skip to content

Commit 62a3c52

Browse files
committed
audio: component: Add const to source buffer parameter in cir_buf_copy()
Qualify the source pointer of circular buffer as const in cir_buf_copy() and cir_buf_bytes_without_wrap() functions. Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
1 parent 6589967 commit 62a3c52

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/audio/component.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
269269
return samples;
270270
}
271271

272-
void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
272+
void cir_buf_copy(const void *src, const void *src_addr, const void *src_end, void *dst,
273273
void *dst_addr, void *dst_end, size_t byte_size)
274274
{
275275
size_t bytes = byte_size;
@@ -281,7 +281,7 @@ void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
281281
ae_int16x4 in_sample1, in_sample2;
282282
ae_valignx2 inu;
283283
ae_valignx2 outu = AE_ZALIGN128();
284-
ae_int16x8 *in = (ae_int16x8 *)src;
284+
const ae_int16x8 *in = cir_buf_wrap(src, src_addr, src_end);
285285
ae_int16x8 *out = (ae_int16x8 *)dst;
286286

287287
while (bytes) {
@@ -360,7 +360,7 @@ int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
360360
return samples;
361361
}
362362

363-
void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
363+
void cir_buf_copy(const void *src, const void *src_addr, const void *src_end, void *dst,
364364
void *dst_addr, void *dst_end, size_t byte_size)
365365
{
366366
size_t bytes = byte_size;
@@ -373,7 +373,7 @@ void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
373373
ae_int16x4 in_sample = AE_ZERO16();
374374
ae_valign inu = AE_ZALIGN64();
375375
ae_valign outu = AE_ZALIGN64();
376-
ae_int16x4 *in = (ae_int16x4 *)src;
376+
ae_int16x4 *in = cir_buf_wrap(src, src_addr, src_end);
377377
ae_int16x4 *out = (ae_int16x4 *)dst;
378378

379379
while (bytes) {
@@ -433,14 +433,14 @@ int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
433433
return samples;
434434
}
435435

436-
void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
436+
void cir_buf_copy(const void *src, const void *src_addr, const void *src_end, void *dst,
437437
void *dst_addr, void *dst_end, size_t byte_size)
438438
{
439439
size_t bytes = byte_size;
440440
size_t bytes_src;
441441
size_t bytes_dst;
442442
size_t bytes_copied;
443-
uint8_t *in = (uint8_t *)src;
443+
const uint8_t *in = src;
444444
uint8_t *out = (uint8_t *)dst;
445445

446446
while (bytes) {

src/include/sof/audio/audio_stream.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ audio_stream_samples_without_wrap_s32(const struct audio_stream *source, const v
902902
* @return Number of bytes to buffer wrap. For number of samples calculate
903903
* need to add size of sample to returned bytes count.
904904
*/
905-
static inline int cir_buf_bytes_without_wrap(void *ptr, void *buf_end)
905+
static inline int cir_buf_bytes_without_wrap(const void *ptr, const void *buf_end)
906906
{
907907
assert((intptr_t)buf_end >= (intptr_t)ptr);
908908
return (intptr_t)buf_end - (intptr_t)ptr;
@@ -946,7 +946,7 @@ int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
946946
* @param dst_end End address of sink circular buffer.
947947
* @param byte_size Number of bytes to copy.
948948
*/
949-
void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
949+
void cir_buf_copy(const void *src, const void *src_addr, const void *src_end, void *dst,
950950
void *dst_addr, void *dst_end, size_t byte_size);
951951

952952
/**

0 commit comments

Comments
 (0)