[PATCH] ice1724: enable MIDI on Terratec Aureon 7.1 Universe

[PATCH] ice1724: enable MIDI on Terratec Aureon 7.1 Universe

[Maximilian Rehkopf]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

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?

Signed-off-by: Maximilian Rehkopf <otakon@gmx.net>

-- 
Maximilian Rehkopf <otakon@gmx.net>


[-- Attachment #2: universe-midi.patch --]
[-- Type: text/x-patch, Size: 1576 bytes --]

diff --git a/alsa-kernel.orig/sound/pci/ice1712/aureon.c b/alsa-kernel/sound/pci/ice1712/aureon.c
index 868ae29..3676b89 100644
--- a/alsa-kernel.orig/sound/pci/ice1712/aureon.c
+++ b/alsa-kernel/sound/pci/ice1712/aureon.c
@@ -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 */
 	},
 	{


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ice1724: enable MIDI on Terratec Aureon 7.1 Universe

[Takashi Iwai]

At Fri, 29 Aug 2008 13:01:00 +0200,
Maximilian Rehkopf wrote:
> 
> 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?
> 
> Signed-off-by: Maximilian Rehkopf <otakon@gmx.net>

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

Re: [PATCH] ice1724: enable MIDI on Terratec Aureon 7.1 Universe

[Vedran Miletić]

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 <tiwai@suse.de>:
> At Fri, 29 Aug 2008 13:01:00 +0200,
> Maximilian Rehkopf wrote:
>>
>> 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?
>>
>> Signed-off-by: Maximilian Rehkopf <otakon@gmx.net>
>
> 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
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>



-- 
Vedran Miletić
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ice1724: enable MIDI on Terratec Aureon 7.1 Universe

[Takashi Iwai]

At Fri, 29 Aug 2008 18:39:26 +0200,
=?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

> 2008/8/29 Takashi Iwai <tiwai@suse.de>:
> > At Fri, 29 Aug 2008 13:01:00 +0200,
> > Maximilian Rehkopf wrote:
> >>
> >> 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?
> >>
> >> Signed-off-by: Maximilian Rehkopf <otakon@gmx.net>
> >
> > 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
> > Alsa-devel@alsa-project.org
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> >
> 
> 
> 
> -- 
> Vedran Miletić
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel