Skip to contentSkip to conversation

ice1724: enable MIDI on Terratec Aureon 7.1 Universe

PATCH Applied Maximilian Rehkopf 3 participants 4 messages Aug 29, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ice1724: enable MIDI on Terratec Aureon 7.1 Universe

This enables MIDI on Terratec Aureon 7.1 Universe cards specifically. Apparently the other envy24ht-based Aureon cards do not have MIDI ports, hence I added a Universe specific eeprom array.

The newer cards (Aureon 7.1 PCI / 5.1 PCI/Fun) have MIDI but use a CMI DSP so this driver does not concern them at all.

I am new to git, do I have to perform any git operations regarding the patch myself?

Signature · 1 line
Maximilian Rehkopf <[email protected]>
alsa-kernel/sound/pci/ice1712/aureon.c renamed from alsa-kernel.orig/sound/pci/ice1712/aureon.c +18 -2
index 868ae29..3676b89 100644
@@ -2158,6 +2158,22 @@ static unsigned char aureon71_eeprom[] __devinitdata = {
 };
 #define prodigy71_eeprom aureon71_eeprom
 
+static unsigned char aureon71_universe_eeprom[] __devinitdata = {
+	[ICE_EEP2_SYSCONF]     = 0x2b,	/* clock 512, mpu401, spdif-in/ADC, 4DACs */
+	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */
+	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */
+	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */
+	[ICE_EEP2_GPIO_DIR]    = 0xff,
+	[ICE_EEP2_GPIO_DIR1]   = 0xff,
+	[ICE_EEP2_GPIO_DIR2]   = 0x5f,
+	[ICE_EEP2_GPIO_MASK]   = 0x00,
+	[ICE_EEP2_GPIO_MASK1]  = 0x00,
+	[ICE_EEP2_GPIO_MASK2]  = 0x00,
+	[ICE_EEP2_GPIO_STATE]  = 0x00,
+	[ICE_EEP2_GPIO_STATE1] = 0x00,
+	[ICE_EEP2_GPIO_STATE2] = 0x00,
+};
+
 static unsigned char prodigy71lt_eeprom[] __devinitdata = {
 	[ICE_EEP2_SYSCONF]     = 0x4b,	/* clock 384, spdif-in/ADC, 4DACs */
 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */
@@ -2203,8 +2219,8 @@ struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {
 		.model = "universe",
  		.chip_init = aureon_init,
  		.build_controls = aureon_add_controls,
- 		.eeprom_size = sizeof(aureon71_eeprom),
- 		.eeprom_data = aureon71_eeprom,
+ 		.eeprom_size = sizeof(aureon71_universe_eeprom),
+ 		.eeprom_data = aureon71_universe_eeprom,
 		.driver = "Aureon71Univ", /* keep in 15 letters */
 	},
 	{

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Applied
#1 lore raw

At Fri, 29 Aug 2008 13:01:00 +0200,

Quoted 5 lines · Maximilian Rehkopf

This enables MIDI on Terratec Aureon 7.1 Universe cards specifically. Apparently the other envy24ht-based Aureon cards do not have MIDI ports, hence I added a Universe specific eeprom array.

Quoted 7 lines

The newer cards (Aureon 7.1 PCI / 5.1 PCI/Fun) have MIDI but use a CMI DSP so this driver does not concern them at all.

I am new to git, do I have to perform any git operations regarding the patch myself?

Thanks, applied with minor fixes of spacing.

About create a patch via git, usually either of the following:

- Commit changes and create a patch via git-show or git-format-patch

   ... change your tree
   % git commit -a --sign
   % git show --pretty=email > mypatch
   or
   % git format-patch HEAD~..HEAD

- Simply run git-diff to create a patch

... change your tree
% git diff > mypatch

The former way is helpful for us since it can be applied as is. In the latter case, you'll need to write the patch description and sign-off manually in your mail.

In either case, better to run checkpatch.pl once to check the coding style before submission. The script is found in scripts directory of linux kernel tree.

Takashi

#2 lore raw

Thank you for this guide, it helped me a lot. Perhaps it should be added to wiki as "10 second introduction to git for new contributors", as I believe that most people would like to know this.

2008/8/29 Takashi Iwai <[email protected]>:

Quoted 47 lines

At Fri, 29 Aug 2008 13:01:00 +0200,

Quoted 5 lines · Maximilian Rehkopf

This enables MIDI on Terratec Aureon 7.1 Universe cards specifically. Apparently the other envy24ht-based Aureon cards do not have MIDI ports, hence I added a Universe specific eeprom array.

Quoted 7 lines

The newer cards (Aureon 7.1 PCI / 5.1 PCI/Fun) have MIDI but use a CMI DSP so this driver does not concern them at all.

I am new to git, do I have to perform any git operations regarding the patch myself?

Thanks, applied with minor fixes of spacing.

About create a patch via git, usually either of the following:

- Commit changes and create a patch via git-show or git-format-patch

  ... change your tree
  % git commit -a --sign
  % git show --pretty=email > mypatch
  or
  % git format-patch HEAD~..HEAD

- Simply run git-diff to create a patch

... change your tree
% git diff > mypatch

The former way is helpful for us since it can be applied as is. In the latter case, you'll need to write the patch description and sign-off manually in your mail.

In either case, better to run checkpatch.pl once to check the coding style before submission. The script is found in scripts directory of linux kernel tree.

Takashi
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Signature · 5 lines
Vedran Miletić
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#3 lore raw

At Fri, 29 Aug 2008 18:39:26 +0200,

Quoted 4 lines · =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote:

Thank you for this guide, it helped me a lot. Perhaps it should be added to wiki as "10 second introduction to git for new contributors", as I believe that most people would like to know this.

Well, it's a Wiki for everyone.
Feel free to add any good contents by yourself, too ;)

thanks,

Takashi

Quoted 42 lines

2008/8/29 Takashi Iwai <[email protected]>:

Quoted 41 lines

At Fri, 29 Aug 2008 13:01:00 +0200,

Quoted 5 lines · Maximilian Rehkopf

This enables MIDI on Terratec Aureon 7.1 Universe cards specifically. Apparently the other envy24ht-based Aureon cards do not have MIDI ports, hence I added a Universe specific eeprom array.

Quoted 7 lines

The newer cards (Aureon 7.1 PCI / 5.1 PCI/Fun) have MIDI but use a CMI DSP so this driver does not concern them at all.

I am new to git, do I have to perform any git operations regarding the patch myself?

Thanks, applied with minor fixes of spacing.

About create a patch via git, usually either of the following:

- Commit changes and create a patch via git-show or git-format-patch

  ... change your tree
  % git commit -a --sign
  % git show --pretty=email > mypatch
  or
  % git format-patch HEAD~..HEAD

- Simply run git-diff to create a patch

... change your tree
% git diff > mypatch

The former way is helpful for us since it can be applied as is. In the latter case, you'll need to write the patch description and sign-off manually in your mail.

In either case, better to run checkpatch.pl once to check the coding style before submission. The script is found in scripts directory of linux kernel tree.

Quoted 11 lines
Quoted 6 lines

Takashi
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Signature · 1 line
Vedran Miletić

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel