Commit 6175ccd1 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Takashi Iwai
Browse files

ALSA: emu10k1: omit non-applicable mixer controls for E-MU cards 



The E-MU cards don't try very hard to be Sound Blasters. All sound I/O
goes through the Hana FPGA, thus making the regular extin/out controls
useless. Still showing them just serves to clutter up the interface and
confuse the user.

Signed-off-by: default avatarOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230514170323.3408834-5-oswald.buddenhagen@gmx.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1a38ae57

sound/pci/emu10k1/emufx.c

+116 −117
Original line number Diff line number Diff line
@@ -1379,7 +1379,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
		snd_emu10k1_init_stereo_control(&controls[nctl++], "EMU Capture Volume", gpr, 0);

		gpr_map[gpr + 2] = 0x00000000;

		gpr += 3;

	}

	} else {

		/* AC'97 Playback Volume - used only for mic (renamed later) */

		A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AC97_L);

		A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AC97_R);
@@ -1460,6 +1460,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
						emu->card_capabilities->ac97_chip ? "Aux2 Capture Volume" : "Aux Capture Volume",

						gpr, 0);

		gpr += 2;

	}

	

	/* Stereo Mix Front Playback Volume */

	A_OP(icode, &ptr, iMAC0, A_GPR(playback), A_GPR(playback), A_GPR(gpr), A_GPR(stereo_mix));
@@ -1580,19 +1581,6 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
	snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0);

	gpr++;



	/* analog speakers */

	A_PUT_STEREO_OUTPUT(A_EXTOUT_AFRONT_L, A_EXTOUT_AFRONT_R, playback);

	A_PUT_STEREO_OUTPUT(A_EXTOUT_AREAR_L, A_EXTOUT_AREAR_R, playback+2);

	A_PUT_OUTPUT(A_EXTOUT_ACENTER, playback+4);

	A_PUT_OUTPUT(A_EXTOUT_ALFE, playback+5);

	if (emu->card_capabilities->spk71)

		A_PUT_STEREO_OUTPUT(A_EXTOUT_ASIDE_L, A_EXTOUT_ASIDE_R, playback+6);



	/* headphone */

	A_PUT_STEREO_OUTPUT(A_EXTOUT_HEADPHONE_L, A_EXTOUT_HEADPHONE_R, playback);



	/* digital outputs */

	/* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */

	if (emu->card_capabilities->emu_model) {

		/* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */

		dev_info(emu->card->dev, "EMU outputs on\n");
@@ -1603,7 +1591,17 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
				A_OP(icode, &ptr, iACC3, A_EMU32OUTL(z), A_GPR(playback + z), A_C_00000000, A_C_00000000);

			}

		}

	}

	} else {

		/* analog speakers */

		A_PUT_STEREO_OUTPUT(A_EXTOUT_AFRONT_L, A_EXTOUT_AFRONT_R, playback);

		A_PUT_STEREO_OUTPUT(A_EXTOUT_AREAR_L, A_EXTOUT_AREAR_R, playback+2);

		A_PUT_OUTPUT(A_EXTOUT_ACENTER, playback+4);

		A_PUT_OUTPUT(A_EXTOUT_ALFE, playback+5);

		if (emu->card_capabilities->spk71)

			A_PUT_STEREO_OUTPUT(A_EXTOUT_ASIDE_L, A_EXTOUT_ASIDE_R, playback+6);



		/* headphone */

		A_PUT_STEREO_OUTPUT(A_EXTOUT_HEADPHONE_L, A_EXTOUT_HEADPHONE_R, playback);



		/* IEC958 Optical Raw Playback Switch */

		gpr_map[gpr++] = 0;
@@ -1634,6 +1632,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
		A_PUT_STEREO_OUTPUT(A_EXTOUT_REAR_L, A_EXTOUT_REAR_R, playback+2);

		A_PUT_OUTPUT(A_EXTOUT_CENTER, playback+4);

		A_PUT_OUTPUT(A_EXTOUT_LFE, playback+5);

	}



	/* ADC buffer */

#ifdef EMU10K1_CAPTURE_DIGITAL_OUT