From 240b067d0d08203529279ecf5638ed153e47ce8f Mon Sep 17 00:00:00 2001 From: Marcin Rajwa Date: Wed, 1 Apr 2020 10:53:03 +0200 Subject: [PATCH] kpb: change the name of draining data structure This patch changes the name of "dd" structure to more meaningful "draining_data". Therefore code is more readable. Signed-off-by: Marcin Rajwa --- src/audio/kpb.c | 8 +++++--- src/include/sof/audio/kpb.h | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/audio/kpb.c b/src/audio/kpb.c index bed1554de..5d8b9b035 100644 --- a/src/audio/kpb.c +++ b/src/audio/kpb.c @@ -68,7 +68,7 @@ struct comp_data { struct comp_buffer *host_sink; /**< draining sink (client) */ struct history_buffer *hb; /**< internal history buffer */ size_t buffered_data; /**< keeps info about amount of buffered data */ - struct dd draining_task_data; + struct draining_data draining_task_data; size_t buffer_size; /**< size of internal history buffer */ size_t host_buffer_size; /**< size of host buffer */ size_t host_period_size; /**< size of history period */ @@ -737,6 +737,7 @@ static int kpb_copy(struct comp_dev *dev) /* In draining and init draining we only buffer data in * the internal history buffer. */ + if (source->stream.avail <= kpb->buffer_size) { buffer_invalidate(source, source->stream.avail); ret = kpb_buffer_data(dev, source, @@ -785,7 +786,7 @@ static int kpb_buffer_data(struct comp_dev *dev, uint64_t timeout = 0; uint64_t current_time; enum kpb_state state_preserved = kpb->state; - struct dd *draining_data = &kpb->draining_task_data; + struct draining_data *draining_data = &kpb->draining_task_data; size_t sample_width = kpb->config.sampling_width; struct timer *timer = timer_get(); @@ -1068,6 +1069,7 @@ static void kpb_init_draining(struct comp_dev *dev, struct kpb_client *cli) } } while (buff != first_buff); + spin_unlock_irq(&kpb->lock, flags); /* Should we drain in synchronized mode (sync_draining_mode)? @@ -1126,7 +1128,7 @@ static void kpb_init_draining(struct comp_dev *dev, struct kpb_client *cli) */ static enum task_state kpb_draining_task(void *arg) { - struct dd *draining_data = (struct dd *)arg; + struct draining_data *draining_data = (struct draining_data *)arg; struct comp_buffer *sink = draining_data->sink; struct history_buffer *buff = draining_data->hb; size_t history_depth = draining_data->history_depth; diff --git a/src/include/sof/audio/kpb.h b/src/include/sof/audio/kpb.h index e7b602019..41e70e44d 100644 --- a/src/include/sof/audio/kpb.h +++ b/src/include/sof/audio/kpb.h @@ -108,7 +108,8 @@ struct history_buffer { struct history_buffer *prev; /**< next history buffer */ }; -struct dd { +/* Draining task data */ +struct draining_data { struct comp_buffer *sink; struct history_buffer *hb; size_t history_depth;