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

ALSA: bebob: Add support for Terratec PHASE, EWS series and Aureon 



This commit allows this driver to support all of models which Terratec produced
with DM1000/BeBoB. They are:
 - PHASE 24 FW
 - PHASE X24 FW
 - PHASE 88 Rack FW
 - EWS MIC2
 - EWS MIC4
 - Aureon 7.1 Firewire

For Phase series, this commit adds a Terratec specific operation. To get source
of clock. AV/C Audio Subunit command is used.

For EWS series and Aureon, this module uses normal operations.

Tested-by: Maximilian Engelhardt <maxi@daemonizer.de> (PHASE 24 FW)
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1fc9522a

sound/firewire/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ config SND_BEBOB 
	  * Lynx Aurora 8/16 (LT-FW)

	  * ICON FireXon

	  * PrismSound Orpheus/ADA-8XR

	  * TerraTec PHASE 24 FW/PHASE X24 FW/PHASE 88 Rack FW

	  * Terratec EWS MIC2/EWS MIC4

	  * Terratec Aureon 7.1 Firewire



          To compile this driver as a module, choose M here: the module

          will be called snd-bebob.

sound/firewire/bebob/Makefile

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

		  bebob_pcm.o bebob_hwdep.o bebob.o

		  bebob_pcm.o bebob_hwdep.o bebob_terratec.o bebob.o

obj-m += snd-bebob.o

sound/firewire/bebob/bebob.c

+11 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static DECLARE_BITMAP(devices_used, SNDRV_CARDS); 
#define VEN_LYNX	0x000019e5

#define VEN_ICON	0x00001a9e

#define VEN_PRISMSOUND	0x00001198

#define VEN_TERRATEC	0x00000aac



static int

name_device(struct snd_bebob *bebob, unsigned int vendor_id)
@@ -290,6 +291,16 @@ static const struct ieee1394_device_id bebob_id_table[] = { 
	SND_BEBOB_DEV_ENTRY(VEN_PRISMSOUND, 0x00010048, &spec_normal),

	/* PrismSound, ADA-8XR */

	SND_BEBOB_DEV_ENTRY(VEN_PRISMSOUND, 0x0000ada8, &spec_normal),

	/* TerraTec Electronic GmbH, PHASE 88 Rack FW */

	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000003, &phase88_rack_spec),

	/* TerraTec Electronic GmbH, PHASE 24 FW */

	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000004, &phase24_series_spec),

	/* TerraTec Electronic GmbH, Phase X24 FW */

	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000007, &phase24_series_spec),

	/* TerraTec Electronic GmbH, EWS MIC2/MIC8 */

	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000005, &spec_normal),

	/* Terratec Electronic GmbH, Aureon 7.1 Firewire */

	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000002, &spec_normal),

	/* IDs are unknown but able to be supported */

	/*  Apogee, Mini-ME Firewire */

	/*  Apogee, Mini-DAC Firewire */

sound/firewire/bebob/bebob.h

+4 −0
Original line number Diff line number Diff line
@@ -224,6 +224,10 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob); 


int snd_bebob_create_hwdep_device(struct snd_bebob *bebob);



/* model specific operations */

extern struct snd_bebob_spec phase88_rack_spec;

extern struct snd_bebob_spec phase24_series_spec;



#define SND_BEBOB_DEV_ENTRY(vendor, model, data) \

{ \

	.match_flags	= IEEE1394_MATCH_VENDOR_ID | \

sound/firewire/bebob/bebob_terratec.c

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * bebob_terratec.c - a part of driver for BeBoB based devices

 *

 * Copyright (c) 2013-2014 Takashi Sakamoto

 *

 * Licensed under the terms of the GNU General Public License, version 2.

 */



#include "./bebob.h"



static char *const phase88_rack_clk_src_labels[] = {

	SND_BEBOB_CLOCK_INTERNAL, "Digital In", "Word Clock"

};

static int

phase88_rack_clk_src_get(struct snd_bebob *bebob, unsigned int *id)

{

	unsigned int enable_ext, enable_word;

	int err;



	err = avc_audio_get_selector(bebob->unit, 0, 0, &enable_ext);

	if (err < 0)

		goto end;

	err = avc_audio_get_selector(bebob->unit, 0, 0, &enable_word);

	if (err < 0)

		goto end;



	*id = (enable_ext & 0x01) | ((enable_word & 0x01) << 1);

end:

	return err;

}



static char *const phase24_series_clk_src_labels[] = {

	SND_BEBOB_CLOCK_INTERNAL, "Digital In"

};

static int

phase24_series_clk_src_get(struct snd_bebob *bebob, unsigned int *id)

{

	return avc_audio_get_selector(bebob->unit, 0, 4, id);

}



struct snd_bebob_rate_spec phase_series_rate_spec = {

	.get	= &snd_bebob_stream_get_rate,

	.set	= &snd_bebob_stream_set_rate,

};



/* PHASE 88 Rack FW */

struct snd_bebob_clock_spec phase88_rack_clk = {

	.num	= ARRAY_SIZE(phase88_rack_clk_src_labels),

	.labels	= phase88_rack_clk_src_labels,

	.get	= &phase88_rack_clk_src_get,

};

struct snd_bebob_spec phase88_rack_spec = {

	.clock	= &phase88_rack_clk,

	.rate	= &phase_series_rate_spec,

	.meter	= NULL

};



/* 'PHASE 24 FW' and 'PHASE X24 FW' */

struct snd_bebob_clock_spec phase24_series_clk = {

	.num	= ARRAY_SIZE(phase24_series_clk_src_labels),

	.labels	= phase24_series_clk_src_labels,

	.get	= &phase24_series_clk_src_get,

};

struct snd_bebob_spec phase24_series_spec = {

	.clock	= &phase24_series_clk,

	.rate	= &phase_series_rate_spec,

	.meter	= NULL

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE