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

Commit a2328d02 authored by Giuliano Pochini's avatar Giuliano Pochini Committed by Takashi Iwai
Browse files

ALSA: Echoaudio: add support for Indigo express cards 



This patch adds support for IndigoIOx and IndigoDJx.

Signed-off-by: default avatarGiuliano Pochini <pochini@shiny.it>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4c55bb01

sound/pci/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -400,6 +400,26 @@ config SND_INDIGODJ 
	  To compile this driver as a module, choose M here: the module

	  will be called snd-indigodj



config SND_INDIGOIOX

	tristate "(Echoaudio) Indigo IOx"

	select FW_LOADER

	select SND_PCM

	help

	  Say 'Y' or 'M' to include support for Echoaudio Indigo IOx.



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

	  will be called snd-indigoiox



config SND_INDIGODJX

	tristate "(Echoaudio) Indigo DJx"

	select FW_LOADER

	select SND_PCM

	help

	  Say 'Y' or 'M' to include support for Echoaudio Indigo DJx.



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

	  will be called snd-indigodjx



config SND_EMU10K1

	tristate "Emu10k1 (SB Live!, Audigy, E-mu APS)"

	select FW_LOADER

sound/pci/echoaudio/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ snd-echo3g-objs := echo3g.o 
snd-indigo-objs := indigo.o

snd-indigoio-objs := indigoio.o

snd-indigodj-objs := indigodj.o

snd-indigoiox-objs := indigoiox.o

snd-indigodjx-objs := indigodjx.o



obj-$(CONFIG_SND_DARLA20) += snd-darla20.o

obj-$(CONFIG_SND_GINA20) += snd-gina20.o
@@ -28,3 +30,5 @@ obj-$(CONFIG_SND_ECHO3G) += snd-echo3g.o 
obj-$(CONFIG_SND_INDIGO) += snd-indigo.o

obj-$(CONFIG_SND_INDIGOIO) += snd-indigoio.o

obj-$(CONFIG_SND_INDIGODJ) += snd-indigodj.o

obj-$(CONFIG_SND_INDIGOIOX) += snd-indigoiox.o

obj-$(CONFIG_SND_INDIGODJX) += snd-indigodjx.o

sound/pci/echoaudio/echoaudio.h

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ 
#define INDIGO			0x0090

#define INDIGO_IO		0x00a0

#define INDIGO_DJ		0x00b0

#define DC8			0x00c0

#define INDIGO_IOX		0x00d0

#define INDIGO_DJX		0x00e0

#define ECHO3G			0x0100

sound/pci/echoaudio/echoaudio_dsp.h

+7 −2
Original line number Diff line number Diff line
@@ -576,8 +576,13 @@ SET_LAYLA24_FREQUENCY_REG command. 
#define E3G_ASIC_NOT_LOADED		0xffff

#define E3G_BOX_TYPE_MASK		0xf0



#define EXT_3GBOX_NC			0x01

#define EXT_3GBOX_NOT_SET		0x02

/* Indigo express control register values */

#define INDIGO_EXPRESS_32000		0x02

#define INDIGO_EXPRESS_44100		0x01

#define INDIGO_EXPRESS_48000		0x00

#define INDIGO_EXPRESS_DOUBLE_SPEED	0x10

#define INDIGO_EXPRESS_QUAD_SPEED	0x04

#define INDIGO_EXPRESS_CLOCK_MASK	0x17





/*

sound/pci/echoaudio/indigo_express_dsp.c

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



This file is part of Echo Digital Audio's generic driver library.

Copyright Echo Digital Audio Corporation (c) 1998 - 2005

All rights reserved

www.echoaudio.com



This library is free software; you can redistribute it and/or

modify it under the terms of the GNU Lesser General Public

License as published by the Free Software Foundation; either

version 2.1 of the License, or (at your option) any later version.



This library is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

Lesser General Public License for more details.



You should have received a copy of the GNU Lesser General Public

License along with this library; if not, write to the Free Software

Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA



*************************************************************************



 Translation from C++ and adaptation for use in ALSA-Driver

 were made by Giuliano Pochini <pochini@shiny.it>



*************************************************************************/



static int set_sample_rate(struct echoaudio *chip, u32 rate)

{

	u32 clock, control_reg, old_control_reg;



	if (wait_handshake(chip))

		return -EIO;



	old_control_reg = le32_to_cpu(chip->comm_page->control_register);

	control_reg = old_control_reg & ~INDIGO_EXPRESS_CLOCK_MASK;



	switch (rate) {

	case 32000:

		clock = INDIGO_EXPRESS_32000;

		break;

	case 44100:

		clock = INDIGO_EXPRESS_44100;

		break;

	case 48000:

		clock = INDIGO_EXPRESS_48000;

		break;

	case 64000:

		clock = INDIGO_EXPRESS_32000|INDIGO_EXPRESS_DOUBLE_SPEED;

		break;

	case 88200:

		clock = INDIGO_EXPRESS_44100|INDIGO_EXPRESS_DOUBLE_SPEED;

		break;

	case 96000:

		clock = INDIGO_EXPRESS_48000|INDIGO_EXPRESS_DOUBLE_SPEED;

		break;

	default:

		return -EINVAL;

	}



	control_reg |= clock;

	if (control_reg != old_control_reg) {

		chip->comm_page->control_register = cpu_to_le32(control_reg);

		chip->sample_rate = rate;

		clear_handshake(chip);

		return send_vector(chip, DSP_VC_UPDATE_CLOCKS);

	}

	return 0;

}







/* This function routes the sound from a virtual channel to a real output */

static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe,

			   int gain)

{

	int index;



	if (snd_BUG_ON(pipe >= num_pipes_out(chip) ||

		       output >= num_busses_out(chip)))

		return -EINVAL;



	if (wait_handshake(chip))

		return -EIO;



	chip->vmixer_gain[output][pipe] = gain;

	index = output * num_pipes_out(chip) + pipe;

	chip->comm_page->vmixer[index] = gain;



	DE_ACT(("set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain));

	return 0;

}







/* Tell the DSP to read and update virtual mixer levels in comm page. */

static int update_vmixer_level(struct echoaudio *chip)

{

	if (wait_handshake(chip))

		return -EIO;

	clear_handshake(chip);

	return send_vector(chip, DSP_VC_SET_VMIXER_GAIN);

}







static u32 detect_input_clocks(const struct echoaudio *chip)

{

	return ECHO_CLOCK_BIT_INTERNAL;

}







/* The IndigoIO has no ASIC. Just do nothing */

static int load_asic(struct echoaudio *chip)

{

	return 0;

}