Skip to contentSkip to conversation

emu10k1: Add details for E-mu 0404 PCIe version

PATCH Applied Florian Zeitz 2 participants 4 messages Jun 11, 2011 – Jun 12, 2011 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 emu10k1: Add details for E-mu 0404 PCIe version

This patch adds the necessary details to support the PCIe version of E-MU's 0404 card. I have tested this for some time now and it appears to be working fine.

Quoted 1 line

From comparing the PCBs it seems the PCIe version just added a PCIe

chipset and left all other components pretty much in place. For anyone intrigued to take a look at the PCB there are pictures I took at <http://babelmonkeys.de/~florob/E-MU%200404/>.

This modification was made on top of Takashi Iwai's fix/misc branch.

Regards,
Florian Zeitz

---
 sound/pci/emu10k1/emu10k1_main.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
(quoted diff) +0 -0

b/sound/pci/emu10k1/emu10k1_main.c
index 5e619a8..15f0161 100644

sound/pci/emu10k1/emu10k1_main.c +0 -0
@@ -1440,6 +1440,14 @@ static struct snd_emu_chip_details

emu_chip_details[] = {
.ca0102_chip = 1,
.spk71 = 1,
.emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+ /* EMU0404 PCIe */
+ {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
+ .driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
+ .id = "EMU0404",
+ .emu10k2_chip = 1,
+ .ca0108_chip = 1,
+ .spk71 = 1,
+ .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */
/* Note that all E-mu cards require kernel 2.6 or newer. */ {.vendor = 0x1102, .device = 0x0008,
.driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",

Signature · 1 line
1.7.5.4
#1 lore raw

At Sun, 12 Jun 2011 01:48:44 +0200,

Quoted 11 lines · Florian Zeitz

This patch adds the necessary details to support the PCIe version of E-MU's 0404 card. I have tested this for some time now and it appears to be working fine.

Quoted 1 line

From comparing the PCBs it seems the PCIe version just added a PCIe

chipset and left all other components pretty much in place. For anyone intrigued to take a look at the PCB there are pictures I took at <http://babelmonkeys.de/~florob/E-MU%200404/>.

This modification was made on top of Takashi Iwai's fix/misc branch.

Could you give your sign-off for merging to the upstream? Other than that, the patch looks good.

thanks,

Takashi

Quoted 32 lines

Regards,
Florian Zeitz

---
 sound/pci/emu10k1/emu10k1_main.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
sound/pci/emu10k1/emu10k1_main.c +8 -0
index 5e619a8..15f0161 100644
@@ -1440,6 +1440,14 @@ static struct snd_emu_chip_details
 emu_chip_details[] = {
 	 .ca0102_chip = 1,
 	 .spk71 = 1,
 	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+	/* EMU0404 PCIe */
+	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
+	 .driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
+	 .id = "EMU0404",
+	 .emu10k2_chip = 1,
+	 .ca0108_chip = 1,
+	 .spk71 = 1,
+	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */
 	/* Note that all E-mu cards require kernel 2.6 or newer. */
 	{.vendor = 0x1102, .device = 0x0008,

.driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",

Signature · 1 line
1.7.5.4
#2 lore raw
Quoted 8 lines · Takashi Iwai

At Sun, 12 Jun 2011 01:48:44 +0200,

Quoted 6 lines · Florian Zeitz

This patch adds the necessary details to support the PCIe version of E-MU's 0404 card. I have tested this for some time now and it appears to be working fine.

Quoted 1 line

From comparing the PCBs it seems the PCIe version just added a PCIe

Quoted 9 lines
Quoted 5 lines

chipset and left all other components pretty much in place. For anyone intrigued to take a look at the PCB there are pictures I took at <http://babelmonkeys.de/~florob/E-MU%200404/>.

This modification was made on top of Takashi Iwai's fix/misc branch.

Could you give your sign-off for merging to the upstream? Other than that, the patch looks good.

Sure, and sorry, this is my first time submitting a patch this way.

Attached with added Sign-off, I hope that's okay.

Quoted 6 lines

thanks,

Takashi

From 5cbac4e5bc4b2fe6c3896723efed9bfcdc89fbdf Mon Sep 17 00:00:00 2001

From: Florian Zeitz <[email protected]>
Date: Sun, 12 Jun 2011 01:15:42 +0200
Subject: [PATCH] [ALSA] emu10k1: Add details for E-mu 0404 PCIe version

This patch adds the necessary details to support the PCIe version of E-MU's 0404 card.

Quoted 1 line

From comparing the PCBs it seems the PCIe version just added a PCIe

chipset and left all other components pretty much in place. For anyone intrigued to take a look at the PCB there are pictures I took at <http://babelmonkeys.de/~florob/E-MU%200404/>.

---
 sound/pci/emu10k1/emu10k1_main.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
sound/pci/emu10k1/emu10k1_main.c +8 -0
index 5e619a8..15f0161 100644
@@ -1440,6 +1440,14 @@ static struct snd_emu_chip_details emu_chip_details[] = {
 	 .ca0102_chip = 1,
 	 .spk71 = 1,
 	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+	/* EMU0404 PCIe */
+	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
+	 .driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
+	 .id = "EMU0404",
+	 .emu10k2_chip = 1,
+	 .ca0108_chip = 1,
+	 .spk71 = 1,
+	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */
 	/* Note that all E-mu cards require kernel 2.6 or newer. */
 	{.vendor = 0x1102, .device = 0x0008,
 	 .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
Signature · 1 line
1.7.5.4
Applied
#3 lore raw

At Sun, 12 Jun 2011 19:23:27 +0200,

Quoted 14 lines · Florian Zeitz
Quoted 12 lines · Takashi Iwai

At Sun, 12 Jun 2011 01:48:44 +0200,

Quoted 10 lines · Florian Zeitz

This patch adds the necessary details to support the PCIe version of E-MU's 0404 card. I have tested this for some time now and it appears to be working fine.

Quoted 1 line

From comparing the PCBs it seems the PCIe version just added a PCIe

chipset and left all other components pretty much in place. For anyone intrigued to take a look at the PCB there are pictures I took at <http://babelmonkeys.de/~florob/E-MU%200404/>.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

This modification was made on top of Takashi Iwai's fix/misc branch.

Could you give your sign-off for merging to the upstream? Other than that, the patch looks good.

Sure, and sorry, this is my first time submitting a patch this way.

Attached with added Sign-off, I hope that's okay.

Thanks, applied now.

Takashi