public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ALSA: oxfw: don't add MIDI/PCM interface when packet streaming is unavailable

Browse source 
Stanton SCS.1d doesn't support packet streaming even if it has plugs for
isochronous communication.

This commit is a preparation for this case. The 'has_input' member is
added to specific structure, and MIDI/PCM interfaces are not added when
the member is false.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20200113073418.24622-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2020-01-13 16:34:17 +09:00 • committed by Takashi Iwai
parent 03be63b295
commit 06a42a74a0
3 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/firewire/oxfw/oxfw-stream.c
View file

@ -772,6 +772,8 @@ int snd_oxfw_stream_discover(struct snd_oxfw *oxfw)
if (formation.midi > 0) if (formation.midi > 0)
oxfw->midi_output_ports = 1; oxfw->midi_output_ports = 1;
} }
oxfw->has_input = true;
} }
end: end:
return err; return err;

39
sound/firewire/oxfw/oxfw.c
View file

@ -118,7 +118,8 @@ static void oxfw_card_free(struct snd_card *card)
{ {
struct snd_oxfw *oxfw = card->private_data; struct snd_oxfw *oxfw = card->private_data;
snd_oxfw_stream_destroy_duplex(oxfw); if (oxfw->has_output || oxfw->has_input)
snd_oxfw_stream_destroy_duplex(oxfw);
} }
static int detect_quirks(struct snd_oxfw *oxfw) static int detect_quirks(struct snd_oxfw *oxfw)
@ -206,23 +207,25 @@ static void do_registration(struct work_struct *work)
if (err < 0) if (err < 0)
goto error; goto error;
err = snd_oxfw_stream_init_duplex(oxfw); if (oxfw->has_output || oxfw->has_input) {
if (err < 0) err = snd_oxfw_stream_init_duplex(oxfw);
goto error; if (err < 0)
goto error;
err = snd_oxfw_create_pcm(oxfw); err = snd_oxfw_create_pcm(oxfw);
if (err < 0) if (err < 0)
goto error; goto error;
snd_oxfw_proc_init(oxfw); snd_oxfw_proc_init(oxfw);
err = snd_oxfw_create_midi(oxfw); err = snd_oxfw_create_midi(oxfw);
if (err < 0) if (err < 0)
goto error; goto error;
err = snd_oxfw_create_hwdep(oxfw); err = snd_oxfw_create_hwdep(oxfw);
if (err < 0) if (err < 0)
goto error; goto error;
}
err = snd_card_register(oxfw->card); err = snd_card_register(oxfw->card);
if (err < 0) if (err < 0)
@ -274,9 +277,11 @@ static void oxfw_bus_reset(struct fw_unit *unit)
fcp_bus_reset(oxfw->unit); fcp_bus_reset(oxfw->unit);
if (oxfw->registered) { if (oxfw->registered) {
mutex_lock(&oxfw->mutex); if (oxfw->has_output || oxfw->has_input) {
snd_oxfw_stream_update_duplex(oxfw); mutex_lock(&oxfw->mutex);
mutex_unlock(&oxfw->mutex); snd_oxfw_stream_update_duplex(oxfw);
mutex_unlock(&oxfw->mutex);
}
if (oxfw->entry->vendor_id == OUI_STANTON) if (oxfw->entry->vendor_id == OUI_STANTON)
snd_oxfw_scs1x_update(oxfw); snd_oxfw_scs1x_update(oxfw);

1
sound/firewire/oxfw/oxfw.h
View file

@ -45,6 +45,7 @@ struct snd_oxfw {
bool wrong_dbs; bool wrong_dbs;
bool has_output; bool has_output;
bool has_input;
u8 *tx_stream_formats[SND_OXFW_STREAM_FORMAT_ENTRIES]; u8 *tx_stream_formats[SND_OXFW_STREAM_FORMAT_ENTRIES];
u8 *rx_stream_formats[SND_OXFW_STREAM_FORMAT_ENTRIES]; u8 *rx_stream_formats[SND_OXFW_STREAM_FORMAT_ENTRIES];
bool assumed; bool assumed;