UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Intel: Simplify Baytrail stream control IPC construction 

Baytrail ADSP stream IPC simplifies a little by moving IPC_IA_START_STREAM
construction and sending directly into sst_byt_stream_start() from
sst_byt_stream_operations(). This is because IPC_IA_START_STREAM is only
stream IPC with extra message data so this move saves a few code lines.

Main motivation for this is to prepare for passing stream start position
to sst_byt_stream_start() which will be needed in resume code.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jarkko Nikula 2014-05-08 16:07:22 +03:00 committed by Mark Brown
parent c83649e3cd
commit 65ee9e8fb6
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/intel/sst-baytrail-ipc.c
View File

@ -653,36 +653,32 @@ out:
static int sst_byt_stream_operations(struct sst_byt *byt, int type,
int stream_id, int wait)
{
struct sst_byt_start_stream_params start_stream;
u64 header;
void *tx_msg = NULL;
size_t size = 0;
if (type != IPC_IA_START_STREAM) {
header = sst_byt_header(type, 0, false, stream_id);
} else {
start_stream.byte_offset = 0;
header = sst_byt_header(IPC_IA_START_STREAM,
sizeof(start_stream) + sizeof(u32),
true, stream_id);
tx_msg = &start_stream;
size = sizeof(start_stream);
}
header = sst_byt_header(type, 0, false, stream_id);
if (wait)
return sst_byt_ipc_tx_msg_wait(byt, header,
tx_msg, size, NULL, 0);
return sst_byt_ipc_tx_msg_wait(byt, header, NULL, 0, NULL, 0);
else
return sst_byt_ipc_tx_msg_nowait(byt, header, tx_msg, size);
return sst_byt_ipc_tx_msg_nowait(byt, header, NULL, 0);
}
/* stream ALSA trigger operations */
int sst_byt_stream_start(struct sst_byt *byt, struct sst_byt_stream *stream)
{
struct sst_byt_start_stream_params start_stream;
void *tx_msg;
size_t size;
u64 header;
int ret;
ret = sst_byt_stream_operations(byt, IPC_IA_START_STREAM,
stream->str_id, 0);
start_stream.byte_offset = 0;
header = sst_byt_header(IPC_IA_START_STREAM,
sizeof(start_stream) + sizeof(u32),
true, stream->str_id);
tx_msg = &start_stream;
size = sizeof(start_stream);
ret = sst_byt_ipc_tx_msg_nowait(byt, header, tx_msg, size);
if (ret < 0)
dev_err(byt->dev, "ipc: error failed to start stream %d\n",
stream->str_id);