Commit ac5d7786 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai

ALSA: oxfw: support AMDTP domain

This commit adds AMDTP domain support for ALSA oxfw driver.
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent db40eeb2
...@@ -114,19 +114,13 @@ static int start_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream) ...@@ -114,19 +114,13 @@ static int start_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream)
if (err < 0) if (err < 0)
return err; return err;
err = amdtp_stream_start(stream, conn->resources.channel, conn->speed); err = amdtp_domain_add_stream(&oxfw->domain, stream,
conn->resources.channel, conn->speed);
if (err < 0) { if (err < 0) {
cmp_connection_break(conn); cmp_connection_break(conn);
return err; return err;
} }
// Wait first packet.
if (!amdtp_stream_wait_callback(stream, CALLBACK_TIMEOUT)) {
amdtp_stream_stop(stream);
cmp_connection_break(conn);
return -ETIMEDOUT;
}
return 0; return 0;
} }
...@@ -280,12 +274,12 @@ int snd_oxfw_stream_reserve_duplex(struct snd_oxfw *oxfw, ...@@ -280,12 +274,12 @@ int snd_oxfw_stream_reserve_duplex(struct snd_oxfw *oxfw,
pcm_channels = formation.pcm; pcm_channels = formation.pcm;
} }
if (formation.rate != rate || formation.pcm != pcm_channels) { if (formation.rate != rate || formation.pcm != pcm_channels) {
amdtp_stream_stop(&oxfw->rx_stream); amdtp_domain_stop(&oxfw->domain);
cmp_connection_break(&oxfw->in_conn); cmp_connection_break(&oxfw->in_conn);
cmp_connection_release(&oxfw->in_conn); cmp_connection_release(&oxfw->in_conn);
if (oxfw->has_output) { if (oxfw->has_output) {
amdtp_stream_stop(&oxfw->tx_stream);
cmp_connection_break(&oxfw->out_conn); cmp_connection_break(&oxfw->out_conn);
cmp_connection_release(&oxfw->out_conn); cmp_connection_release(&oxfw->out_conn);
} }
...@@ -325,55 +319,66 @@ int snd_oxfw_stream_start_duplex(struct snd_oxfw *oxfw) ...@@ -325,55 +319,66 @@ int snd_oxfw_stream_start_duplex(struct snd_oxfw *oxfw)
if (amdtp_streaming_error(&oxfw->rx_stream) || if (amdtp_streaming_error(&oxfw->rx_stream) ||
amdtp_streaming_error(&oxfw->tx_stream)) { amdtp_streaming_error(&oxfw->tx_stream)) {
amdtp_stream_stop(&oxfw->rx_stream); amdtp_domain_stop(&oxfw->domain);
cmp_connection_break(&oxfw->in_conn);
if (oxfw->has_output) { cmp_connection_break(&oxfw->in_conn);
amdtp_stream_stop(&oxfw->tx_stream); if (oxfw->has_output)
cmp_connection_break(&oxfw->out_conn); cmp_connection_break(&oxfw->out_conn);
} }
}
if (!amdtp_stream_running(&oxfw->rx_stream)) { if (!amdtp_stream_running(&oxfw->rx_stream)) {
err = start_stream(oxfw, &oxfw->rx_stream); err = start_stream(oxfw, &oxfw->rx_stream);
if (err < 0) { if (err < 0) {
dev_err(&oxfw->unit->device, dev_err(&oxfw->unit->device,
"fail to start rx stream: %d\n", err); "fail to prepare rx stream: %d\n", err);
goto error; goto error;
} }
}
if (oxfw->has_output) { if (oxfw->has_output &&
if (!amdtp_stream_running(&oxfw->tx_stream)) { !amdtp_stream_running(&oxfw->tx_stream)) {
err = start_stream(oxfw, &oxfw->tx_stream); err = start_stream(oxfw, &oxfw->tx_stream);
if (err < 0) { if (err < 0) {
dev_err(&oxfw->unit->device, dev_err(&oxfw->unit->device,
"fail to start tx stream: %d\n", err); "fail to prepare tx stream: %d\n", err);
goto error; goto error;
} }
} }
err = amdtp_domain_start(&oxfw->domain);
if (err < 0)
goto error;
// Wait first packet.
if (!amdtp_stream_wait_callback(&oxfw->rx_stream,
CALLBACK_TIMEOUT) ||
!amdtp_stream_wait_callback(&oxfw->tx_stream,
CALLBACK_TIMEOUT)) {
err = -ETIMEDOUT;
goto error;
}
} }
return 0; return 0;
error: error:
amdtp_stream_stop(&oxfw->rx_stream); amdtp_domain_stop(&oxfw->domain);
cmp_connection_break(&oxfw->in_conn); cmp_connection_break(&oxfw->in_conn);
if (oxfw->has_output) { if (oxfw->has_output)
amdtp_stream_stop(&oxfw->tx_stream);
cmp_connection_break(&oxfw->out_conn); cmp_connection_break(&oxfw->out_conn);
}
return err; return err;
} }
void snd_oxfw_stream_stop_duplex(struct snd_oxfw *oxfw) void snd_oxfw_stream_stop_duplex(struct snd_oxfw *oxfw)
{ {
if (oxfw->substreams_count == 0) { if (oxfw->substreams_count == 0) {
amdtp_stream_stop(&oxfw->rx_stream); amdtp_domain_stop(&oxfw->domain);
cmp_connection_break(&oxfw->in_conn); cmp_connection_break(&oxfw->in_conn);
cmp_connection_release(&oxfw->in_conn); cmp_connection_release(&oxfw->in_conn);
if (oxfw->has_output) { if (oxfw->has_output) {
amdtp_stream_stop(&oxfw->tx_stream);
cmp_connection_break(&oxfw->out_conn); cmp_connection_break(&oxfw->out_conn);
cmp_connection_release(&oxfw->out_conn); cmp_connection_release(&oxfw->out_conn);
} }
...@@ -409,13 +414,22 @@ int snd_oxfw_stream_init_duplex(struct snd_oxfw *oxfw) ...@@ -409,13 +414,22 @@ int snd_oxfw_stream_init_duplex(struct snd_oxfw *oxfw)
} }
} }
return 0; err = amdtp_domain_init(&oxfw->domain);
if (err < 0) {
destroy_stream(oxfw, &oxfw->rx_stream);
if (oxfw->has_output)
destroy_stream(oxfw, &oxfw->tx_stream);
}
return err;
} }
// This function should be called before starting the stream or after stopping // This function should be called before starting the stream or after stopping
// the streams. // the streams.
void snd_oxfw_stream_destroy_duplex(struct snd_oxfw *oxfw) void snd_oxfw_stream_destroy_duplex(struct snd_oxfw *oxfw)
{ {
amdtp_domain_destroy(&oxfw->domain);
destroy_stream(oxfw, &oxfw->rx_stream); destroy_stream(oxfw, &oxfw->rx_stream);
if (oxfw->has_output) if (oxfw->has_output)
...@@ -424,13 +438,13 @@ void snd_oxfw_stream_destroy_duplex(struct snd_oxfw *oxfw) ...@@ -424,13 +438,13 @@ void snd_oxfw_stream_destroy_duplex(struct snd_oxfw *oxfw)
void snd_oxfw_stream_update_duplex(struct snd_oxfw *oxfw) void snd_oxfw_stream_update_duplex(struct snd_oxfw *oxfw)
{ {
amdtp_stream_stop(&oxfw->rx_stream); amdtp_domain_stop(&oxfw->domain);
cmp_connection_break(&oxfw->in_conn); cmp_connection_break(&oxfw->in_conn);
amdtp_stream_pcm_abort(&oxfw->rx_stream); amdtp_stream_pcm_abort(&oxfw->rx_stream);
if (oxfw->has_output) { if (oxfw->has_output) {
amdtp_stream_stop(&oxfw->tx_stream);
cmp_connection_break(&oxfw->out_conn); cmp_connection_break(&oxfw->out_conn);
amdtp_stream_pcm_abort(&oxfw->tx_stream); amdtp_stream_pcm_abort(&oxfw->tx_stream);
......
...@@ -63,6 +63,8 @@ struct snd_oxfw { ...@@ -63,6 +63,8 @@ struct snd_oxfw {
const struct ieee1394_device_id *entry; const struct ieee1394_device_id *entry;
void *spec; void *spec;
struct amdtp_domain domain;
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment