Echoaudio: Add support for Indigo express cards
PATCH 1/2 Echoaudio: Add support for Indigo express cards
This patch adds support for IndigoIOx and IndigoDJx. I tested IndigoIOx myself, and Carmen Rocco tested the IndigoDJx. It wasn't tested extensively, but I think it stable enough. Maybe you want to mark it as experimental anyway. The soundcard matrix should be updated as well, but the page is locked. These two cards have the same features of their respective CARDBUS versions. The links to the manufacturer's site are:
http://www.echoaudio.com/Products/ExpressCard/IndigoDJx/ and
http://www.echoaudio.com/Products/ExpressCard/IndigoIOx/ .
I want to thank Echoaudio again for their support.
This patch adds support for IndigoIOx and IndigoDJx.
Signed-off-by Giuliano Pochini <[email protected]>
sound/pci/echoaudio/echoaudio_dsp.h renamed from alsa-kernel/pci/echoaudio/echoaudio_dsp.h +7 -2
@@ -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/echoaudio.h renamed from alsa-kernel/pci/echoaudio/echoaudio.h +3 -0
@@ -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/indigodjx.c renamed from alsa-kernel/pci/echoaudio/indigodjx.c +107 -0
107 lines not on this page · raw message
sound/pci/echoaudio/indigodjx_dsp.c renamed from alsa-kernel/pci/echoaudio/indigodjx_dsp.c +65 -0
65 lines not on this page · raw message
sound/pci/echoaudio/indigo_express_dsp.c renamed from alsa-kernel/pci/echoaudio/indigo_express_dsp.c +119 -0
119 lines not on this page · raw message
sound/pci/echoaudio/indigoiox.c renamed from alsa-kernel/pci/echoaudio/indigoiox.c +109 -0
109 lines not on this page · raw message
sound/pci/echoaudio/indigoiox_dsp.c renamed from alsa-kernel/pci/echoaudio/indigoiox_dsp.c +65 -0
65 lines not on this page · raw message
sound/pci/echoaudio/Makefile renamed from alsa-kernel/pci/echoaudio/Makefile +4 -0
@@ -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/Kconfig renamed from alsa-kernel/pci/Kconfig +20 -0
@@ -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
pci/echoaudio/Makefile +4 -1
@@ -11,7 +11,8 @@ include $(SND_TOPDIR)/toplevel.config include $(SND_TOPDIR)/Makefile.conf clean-files := echoaudio.c darla20.c darla24.c echo3g.c gina20.c gina24.c \ - indigo.c indigodj.c indigoio.c layla20.c layla24.c mia.c mona.c + indigo.c indigodj.c indigoio.c indigodjx.c indigoiox.c \ + layla20.c layla24.c mia.c mona.c include $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/Makefile
@@ -26,6 +27,8 @@ gina24.c: gina24.patch $(SND_TOPDIR)/als indigo.c: indigo.patch $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/indigo.c echoaudio.c indigodj.c: indigodj.patch $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/indigodj.c echoaudio.c indigoio.c: indigoio.patch $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/indigoio.c echoaudio.c +indigodjx.c: indigodjx.patch $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/indigodjx.c echoaudio.c +indigoiox.c: indigoiox.patch $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/indigoiox.c echoaudio.c layla20.c: layla20.patch $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/layla20.c echoaudio.c layla24.c: layla24.patch $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/layla24.c echoaudio.c mia.c: mia.patch $(SND_TOPDIR)/alsa-kernel/pci/echoaudio/mia.c echoaudio.c
pci/echoaudio/indigoiox.patch +18 -0
@@ -0,0 +1,18 @@ +--- ../../alsa-kernel/pci/echoaudio/indigoiox.c 2009-03-01 15:26:34.000000000 +0100 ++++ indigoiox.c 2009-03-01 15:32:56.000000000 +0100 +@@ -1,3 +1,9 @@ ++#include "adriver.h" ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) ++#define pci_device(chip) pci_name(chip->pci) ++#endif ++ + /* + * ALSA driver for Echoaudio soundcards. + * Copyright (C) 2009 Giuliano Pochini <[email protected]> +@@ -107,3 +113,5 @@ static struct snd_pcm_hardware pcm_hardw + #include "echoaudio_dsp.c" + #include "echoaudio.c" + ++ ++EXPORT_NO_SYMBOLS;
pci/echoaudio/indigodjx.patch +18 -0
@@ -0,0 +1,18 @@ +--- ../../alsa-kernel/pci/echoaudio/indigodjx.c 2009-03-01 15:26:27.000000000 +0100 ++++ indigodjx.c 2009-03-01 19:02:55.000000000 +0100 +@@ -1,3 +1,9 @@ ++#include "adriver.h" ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) ++#define pci_device(chip) pci_name(chip->pci) ++#endif ++ + /* + * ALSA driver for Echoaudio soundcards. + * Copyright (C) 2009 Giuliano Pochini <[email protected]> +@@ -105,3 +111,5 @@ static struct snd_pcm_hardware pcm_hardw + #include "indigo_express_dsp.c" + #include "echoaudio_dsp.c" + #include "echoaudio.c" ++ ++EXPORT_NO_SYMBOLS;
pci/echoaudio/indigo_express_dsp.c +1 -0
@@ -0,0 +1 @@ +#include "../../alsa-kernel/pci/echoaudio/indigo_express_dsp.c"
pci/echoaudio/indigoiox_dsp.c +1 -0
@@ -0,0 +1 @@ +#include "../../alsa-kernel/pci/echoaudio/indigoiox_dsp.c"
pci/echoaudio/indigodjx_dsp.c +1 -0
@@ -0,0 +1 @@ +#include "../../alsa-kernel/pci/echoaudio/indigodjx_dsp.c"
--
Giuliano.
At Sun, 15 Mar 2009 21:36:42 +0100,
Quoted 10 lines · Giuliano Pochini
This patch adds support for IndigoIOx and IndigoDJx. I tested IndigoIOx myself, and Carmen Rocco tested the IndigoDJx. It wasn't tested extensively, but I think it stable enough. Maybe you want to mark it as experimental anyway. The soundcard matrix should be updated as well, but the page is locked. These two cards have the same features of their respective CARDBUS versions. The links to the manufacturer's site are:
http://www.echoaudio.com/Products/ExpressCard/IndigoDJx/ and
http://www.echoaudio.com/Products/ExpressCard/IndigoIOx/ .
Quoted 6 lines
I want to thank Echoaudio again for their support.
This patch adds support for IndigoIOx and IndigoDJx.
Signed-off-by Giuliano Pochini <[email protected]>
The code looks almost good, but could you do the following?
- split to two patches, one for kernel tree and one for alsa-driver tree
- run checkpatch.pl against the patch and fix issues reported there
thanks,
Takashi
A message that is not in the archive (sent off-list or not yet received): [email protected]
At Mon, 16 Mar 2009 09:14:20 +0100 (CET),
Quoted 9 lines · Giuliano Pochini
Quoted 4 lines · Takashi Iwai
Quoted 3 lines
This patch adds support for IndigoIOx and IndigoDJx.
Signed-off-by Giuliano Pochini <[email protected]>
Quoted 8 lines
Quoted 4 lines
The code looks almost good, but could you do the following?
- split to two patches, one for kernel tree and one for alsa-driver tree
There is a little problem: since about a month ago the git server is SLOWWW. It takes ages to download the alsa-kernel repository at 5KB/s :( I'll try from some server at work which stay on 24/7.
Better to try my sound git tree on kernel.org.
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
The bare alsa-driver tree is:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build.git
The corresponding alsa-driver snapshot is:
ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-snapshot.tar.gz
Takashi
Hi Giuliano,
At Mon, 16 Mar 2009 09:14:20 +0100 (CET),
Quoted 12 lines · Giuliano Pochini
Quoted 8 lines · Takashi Iwai
Quoted 3 lines
This patch adds support for IndigoIOx and IndigoDJx.
Signed-off-by Giuliano Pochini <[email protected]>
The code looks almost good, but could you do the following?
- split to two patches, one for kernel tree and one for alsa-driver tree
Quoted 8 lines
There is a little problem: since about a month ago the git server is SLOWWW. It takes ages to download the alsa-kernel repository at 5KB/s :( I'll try from some server at work which stay on 24/7.
Quoted 1 line
- run checkpatch.pl against the patch and fix issues reported there
Ok !
Any progress on this? I'm asking it because 2.6.29 kernel will likely go out soon, and all patches should be merged before the merge-window is opened.
If you have no time, either we skip it or I'll do a quick fix.
thanks,
Takashi
Quoted 23 lines · Takashi Iwai
Hi Giuliano,
At Mon, 16 Mar 2009 09:14:20 +0100 (CET),
Quoted 19 lines · Giuliano Pochini
Quoted 8 lines · Takashi Iwai
Quoted 3 lines
This patch adds support for IndigoIOx and IndigoDJx.
Signed-off-by Giuliano Pochini <[email protected]>
The code looks almost good, but could you do the following?
- split to two patches, one for kernel tree and one for alsa-driver tree
There is a little problem: since about a month ago the git server is SLOWWW. It takes ages to download the alsa-kernel repository at 5KB/s :( I'll try from some server at work which stay on 24/7.
Quoted 1 line
- run checkpatch.pl against the patch and fix issues reported there
Quoted 7 lines
Quoted 1 line
Ok !
Any progress on this? I'm asking it because 2.6.29 kernel will likely go out soon, and all patches should be merged before the merge-window is opened.
If you have no time, either we skip it or I'll do a quick fix.
I have little time except in the week end. Btw, I'll try to do the work this night.
--
Giuliano.