Update of /cvsroot/alsa/alsa-kernel/pci/ice1712 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11538
Modified Files: hoontech.c Log Message: fix Hoontech DSP* box configuration Index: hoontech.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/hoontech.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hoontech.c 13 Apr 2004 15:39:21 -0000 1.4 +++ hoontech.c 4 May 2004 06:46:29 -0000 1.5 @@ -83,6 +83,7 @@ ICE1712_STDSP24_2_CHN4(ice->hoontech_boxbits, 0); ICE1712_STDSP24_2_MIDI1(ice->hoontech_boxbits, activate); snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]); + snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]); ICE1712_STDSP24_1_CHN1(ice->hoontech_boxbits, 1); ICE1712_STDSP24_1_CHN2(ice->hoontech_boxbits, 1); @@ -117,7 +118,7 @@ up(&ice->gpio_mutex); } -static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int master, int slave) +static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int master) { down(&ice->gpio_mutex); @@ -128,23 +129,26 @@ ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 1); ICE1712_STDSP24_2_MIDI1(ice->hoontech_boxbits, master); snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]); + snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]); udelay(100); ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 0); snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]); - udelay(100); + mdelay(10); ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 1); snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]); - udelay(100); + up(&ice->gpio_mutex); +} - /* MIDI2 is direct */ - ICE1712_STDSP24_3_MIDI2(ice->hoontech_boxbits, slave); +static void __devinit snd_ice1712_stdsp24_midi2(ice1712_t *ice, int activate) +{ + down(&ice->gpio_mutex); + ICE1712_STDSP24_3_MIDI2(ice->hoontech_boxbits, activate); snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]); - up(&ice->gpio_mutex); } @@ -218,8 +222,9 @@ for (chn = 0; chn < 4; chn++) snd_ice1712_stdsp24_box_channel(ice, box, chn, (ice->hoontech_boxconfig[box] & (1 << chn)) ? 1 : 0); snd_ice1712_stdsp24_box_midi(ice, box, - (ice->hoontech_boxconfig[box] & ICE1712_STDSP24_BOX_MIDI1) ? 1 : 0, - (ice->hoontech_boxconfig[box] & ICE1712_STDSP24_BOX_MIDI2) ? 1 : 0); + (ice->hoontech_boxconfig[box] & ICE1712_STDSP24_BOX_MIDI1) ? 1 : 0); + if (ice->hoontech_boxconfig[box] & ICE1712_STDSP24_BOX_MIDI2) + snd_ice1712_stdsp24_midi2(ice, 1); } return 0; ------------------------------------------------------- This SF.Net email is sponsored by: Oracle 10g Get certified on the hottest thing ever to hit the market... Oracle 10g. Take an Oracle 10g class now, and we'll give you the exam FREE. http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog