Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df6a8866 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: bebob: rename file with vendor-dependent code so that it's for Yamaha/Terratec 



Once Yamaha and Terratec cooperated to develop some audio and music units
on IEEE 1394 bus. On these models, the same embedded board is used, and
similar configurations are also applied.

This commit renames file for Yamaha's configuration so that it's for both
of Yamaha and Terratec.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 07cb3272

sound/firewire/bebob/Makefile

+3 −2
Original line number Original line Diff line number Diff line 
snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \

snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \

		  bebob_pcm.o bebob_hwdep.o bebob_terratec.o bebob_yamaha.o \

		  bebob_pcm.o bebob_hwdep.o bebob_terratec.o \

		  bebob_focusrite.o bebob_maudio.o bebob.o

		  bebob_yamaha_terratec.o bebob_focusrite.o bebob_maudio.o \

		  bebob.o

obj-$(CONFIG_SND_BEBOB) += snd-bebob.o
 
obj-$(CONFIG_SND_BEBOB) += snd-bebob.o

sound/firewire/bebob/bebob_yamaha.c→sound/firewire/bebob/bebob_yamaha_terratec.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * must be accompanied. If changing the state, a LED on the device starts to

 * must be accompanied. If changing the state, a LED on the device starts to

 * blink and its sync status is false. In this state, the device sounds nothing

 * blink and its sync status is false. In this state, the device sounds nothing

 * even if streaming. To start streaming at the current sampling rate is only

 * even if streaming. To start streaming at the current sampling rate is only

 * way to revocer this state. GO46 is better for stand-alone mixer.

 * way to recover this state. GO46 is better for stand-alone mixer.

 *

 *

 * Both of them have a capability to change its sampling rate up to 192.0kHz.

 * Both of them have a capability to change its sampling rate up to 192.0kHz.

 * At 192.0kHz, the device reports 4 PCM-in, 1 MIDI-in, 6 PCM-out, 1 MIDI-out.

 * At 192.0kHz, the device reports 4 PCM-in, 1 MIDI-in, 6 PCM-out, 1 MIDI-out.
@@ -25,7 +25,7 @@ 
 * streaming with many asynchronous transactions brings sounds with noises.

 * streaming with many asynchronous transactions brings sounds with noises.

 * Unfortunately current 'ffado-mixer' generated many asynchronous transaction

 * Unfortunately current 'ffado-mixer' generated many asynchronous transaction

 * to observe device's state, mainly check cmp connection and signal format. I

 * to observe device's state, mainly check cmp connection and signal format. I

 * reccomend users to close ffado-mixer at 192.0kHz if mixer is needless.

 * recommend users to close ffado-mixer at 192.0kHz if mixer is needless.

 */

 */





static enum snd_bebob_clock_type clk_src_types[] = {

static enum snd_bebob_clock_type clk_src_types[] = {