xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: oxfw: Split stream functionality to a new file and add a header file

Browse Source 
This is a help for works in followed patches.

And this commit remove 'fw_unit_get()/fw_unit_put()' because these
are called by helper functions in 'snd-firewire-lib'.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto
2014-11-29 00:59:27 +09:00
committed by Takashi Iwai
parent 1a4e39c2e5
commit e2786ca648
4 changed files with 159 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
sound/firewire/oxfw/oxfw-stream.c Normal file
View File

@@ -0,0 +1,80 @@
/*
* oxfw_stream.c - a part of driver for OXFW970/971 based devices
*
* Copyright (c) 2014 Takashi Sakamoto
*
* Licensed under the terms of the GNU General Public License, version 2.
*/
#include "oxfw.h"
int snd_oxfw_stream_init_simplex(struct snd_oxfw *oxfw)
{
int err;
err = cmp_connection_init(&oxfw->in_conn, oxfw->unit,
CMP_INPUT, 0);
if (err < 0)
goto end;
err = amdtp_stream_init(&oxfw->rx_stream, oxfw->unit,
AMDTP_OUT_STREAM, CIP_NONBLOCKING);
if (err < 0) {
amdtp_stream_destroy(&oxfw->rx_stream);
cmp_connection_destroy(&oxfw->in_conn);
}
end:
return err;
}
static void stop_stream(struct snd_oxfw *oxfw)
{
amdtp_stream_pcm_abort(&oxfw->rx_stream);
amdtp_stream_stop(&oxfw->rx_stream);
cmp_connection_break(&oxfw->in_conn);
}
int snd_oxfw_stream_start_simplex(struct snd_oxfw *oxfw)
{
int err = 0;
if (amdtp_streaming_error(&oxfw->rx_stream))
stop_stream(oxfw);
if (amdtp_stream_running(&oxfw->rx_stream))
goto end;
err = cmp_connection_establish(&oxfw->in_conn,
amdtp_stream_get_max_payload(&oxfw->rx_stream));
if (err < 0)
goto end;
err = amdtp_stream_start(&oxfw->rx_stream,
oxfw->in_conn.resources.channel,
oxfw->in_conn.speed);
if (err < 0)
stop_stream(oxfw);
end:
return err;
}
void snd_oxfw_stream_stop_simplex(struct snd_oxfw *oxfw)
{
stop_stream(oxfw);
}
void snd_oxfw_stream_destroy_simplex(struct snd_oxfw *oxfw)
{
stop_stream(oxfw);
amdtp_stream_destroy(&oxfw->rx_stream);
cmp_connection_destroy(&oxfw->in_conn);
}
void snd_oxfw_stream_update_simplex(struct snd_oxfw *oxfw)
{
if (cmp_connection_update(&oxfw->in_conn) < 0)
stop_stream(oxfw);
else
amdtp_stream_update(&oxfw->rx_stream);
}