From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mikael Magnusson Subject: [PATCH 3/5] emu10k1 SB Live: Master volume and front channels via fxbus 8,9 Date: Mon, 21 Feb 2005 20:45:07 +0100 Message-ID: <421A3A43.90309@glocalnet.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060709090306070408020505" Received: from mail.perex.cz (gate.perex.cz [82.113.61.162]) by alsa.alsa-project.org (ALSA's E-mail Delivery System) with ESMTP id 4B1B615A for ; Mon, 21 Feb 2005 20:45:09 +0100 (MET) Received: from mulder.hem.za.org (unknown [84.217.26.207]) by gate.perex.cz (Perex's E-mail Delivery System) with ESMTP id ECA7E57F53 for ; Mon, 21 Feb 2005 20:45:08 +0100 (MET) Received: from skinner.hem.za.org ([192.168.0.2]) by mulder.hem.za.org with esmtp (Exim 4.34) id 1D3JUR-0000a2-TU for alsa-devel@alsa-project.org; Mon, 21 Feb 2005 20:45:07 +0100 Received: from localhost ([127.0.0.1]) by skinner.hem.za.org with esmtp (Exim 4.34) id 1D3JUR-0001aR-Pn for alsa-devel@alsa-project.org; Mon, 21 Feb 2005 20:45:07 +0100 Sender: alsa-devel-admin@lists.sourceforge.net Errors-To: alsa-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , List-Archive: To: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org This is a multi-part message in MIME format. --------------060709090306070408020505 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit front_fx.patch: Adds left and right front channel inputs using fxbus 8 and 9 and "Front" playback and capture controls. Signed-Off-By: Mikael Magnusson --------------060709090306070408020505 Content-Type: text/x-patch; name="front_fx.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="front_fx.patch" diff -u alsa-kernel/pci/emu10k1/emufx.c alsa-kernel/pci/emu10k1/emufx.c --- alsa-kernel/pci/emu10k1/emufx.c 21 Feb 2005 13:34:04 -0000 +++ alsa-kernel/pci/emu10k1/emufx.c 21 Feb 2005 13:34:24 -0000 @@ -934,8 +934,8 @@ return err; } -#define SND_EMU10K1_GPR_CONTROLS 43 -#define SND_EMU10K1_INPUTS 10 +#define SND_EMU10K1_GPR_CONTROLS 46 +#define SND_EMU10K1_INPUTS 12 #define SND_EMU10K1_PLAYBACK_CHANNELS 8 #define SND_EMU10K1_CAPTURE_CHANNELS 4 @@ -1489,7 +1489,7 @@ strcpy(icode->name, "SB Live! FX8010 code for ALSA v1.2 by Jaroslav Kysela"); ptr = 0; i = 0; - /* we have 10 inputs */ + /* we have 12 inputs */ playback = SND_EMU10K1_INPUTS; /* we have 6 playback channels and tone control doubles */ capture = playback + (SND_EMU10K1_PLAYBACK_CHANNELS * 2); @@ -1513,6 +1513,8 @@ OP(icode, &ptr, iMACINT0, GPR(7), C_00000000, FXBUS(FXBUS_PCM_LFE), C_00000004); OP(icode, &ptr, iMACINT0, GPR(8), C_00000000, C_00000000, C_00000000); /* S/PDIF left */ OP(icode, &ptr, iMACINT0, GPR(9), C_00000000, C_00000000, C_00000000); /* S/PDIF right */ + OP(icode, &ptr, iMACINT0, GPR(10), C_00000000, FXBUS(FXBUS_PCM_LEFT_FRONT), C_00000004); + OP(icode, &ptr, iMACINT0, GPR(11), C_00000000, FXBUS(FXBUS_PCM_RIGHT_FRONT), C_00000004); /* Raw S/PDIF PCM */ ipcm->substream = 0; @@ -1659,6 +1661,21 @@ VOLUME_ADD(icode, &ptr, playback + 5, 7, gpr); snd_emu10k1_init_mono_control(controls + i++, "LFE Digital Playback Volume", gpr++, 100); + /* Front Playback Volume */ + for (z = 0; z < 2; z++) + VOLUME_ADD(icode, &ptr, playback + z, 10 + z, gpr + z); + snd_emu10k1_init_stereo_control(controls + i++, "Front Playback Volume", gpr, 100); + gpr += 2; + + /* Front Capture Volume + Switch */ + for (z = 0; z < 2; z++) { + SWITCH(icode, &ptr, tmp + 0, 10 + z, gpr + 2); + VOLUME_ADD(icode, &ptr, capture + z, tmp + 0, gpr + z); + } + snd_emu10k1_init_stereo_control(controls + i++, "Front Capture Volume", gpr, 0); + snd_emu10k1_init_mono_onoff_control(controls + i++, "Front Capture Switch", gpr + 2, 0); + gpr += 3; + /* * Process inputs */ --------------060709090306070408020505-- ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click