Commit 9d2f3863 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Takashi Iwai
Browse files

ALSA: emu10k1: use more existing defines instead of open-coded numbers 



Using the *_MASK defines for "maximal value" is debatable. I got the
idea from FreeBSD, and it sorta makes sense to me.

Some hunks look a bit incomplete, because code that is going to be
subsequently removed is not touched here.

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


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

sound/pci/emu10k1/emu10k1_callback.c

+8 −7
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ release_voice(struct snd_emux_voice *vp) 
	struct snd_emu10k1 *hw;

	

	hw = vp->hw;

	dcysusv = 0x8000 | (unsigned char)vp->reg.parm.modrelease;

	dcysusv = (unsigned char)vp->reg.parm.modrelease | DCYSUSM_PHASE1_MASK;

	snd_emu10k1_ptr_write(hw, DCYSUSM, vp->ch, dcysusv);

	dcysusv = 0x8000 | (unsigned char)vp->reg.parm.volrelease | DCYSUSV_CHANNELENABLE_MASK;

	dcysusv = (unsigned char)vp->reg.parm.volrelease | DCYSUSV_PHASE1_MASK | DCYSUSV_CHANNELENABLE_MASK;

	snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, dcysusv);

}
@@ -138,7 +138,8 @@ terminate_voice(struct snd_emux_voice *vp) 
	if (snd_BUG_ON(!vp))

		return;

	hw = vp->hw;

	snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK);

	snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch,

		DCYSUSV_PHASE1_MASK | DCYSUSV_DECAYTIME_MASK | DCYSUSV_CHANNELENABLE_MASK);

	if (vp->block) {

		struct snd_emu10k1_memblk *emem;

		emem = (struct snd_emu10k1_memblk *)vp->block;
@@ -347,9 +348,9 @@ start_voice(struct snd_emux_voice *vp) 
	}



	/* channel to be silent and idle */

	snd_emu10k1_ptr_write(hw, DCYSUSV, ch, 0x0000);

	snd_emu10k1_ptr_write(hw, VTFT, ch, 0x0000FFFF);

	snd_emu10k1_ptr_write(hw, CVCF, ch, 0x0000FFFF);

	snd_emu10k1_ptr_write(hw, DCYSUSV, ch, 0);

	snd_emu10k1_ptr_write(hw, VTFT, ch, VTFT_FILTERTARGET_MASK);

	snd_emu10k1_ptr_write(hw, CVCF, ch, CVCF_CURRENTFILTER_MASK);

	snd_emu10k1_ptr_write(hw, PTRX, ch, 0);

	snd_emu10k1_ptr_write(hw, CPF, ch, 0);
@@ -453,7 +454,7 @@ start_voice(struct snd_emux_voice *vp) 
	/* reset volume */

	temp = (unsigned int)vp->vtarget << 16;

	snd_emu10k1_ptr_write(hw, VTFT, ch, temp | vp->ftarget);

	snd_emu10k1_ptr_write(hw, CVCF, ch, temp | 0xff00);

	snd_emu10k1_ptr_write(hw, CVCF, ch, temp | CVCF_CURRENTFILTER_MASK);

	return 0;

}

sound/pci/emu10k1/emu10k1_main.c

+23 −23
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ void snd_emu10k1_voice_init(struct snd_emu10k1 *emu, int ch) 
{

	snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0);

	snd_emu10k1_ptr_write(emu, IP, ch, 0);

	snd_emu10k1_ptr_write(emu, VTFT, ch, 0xffff);

	snd_emu10k1_ptr_write(emu, CVCF, ch, 0xffff);

	snd_emu10k1_ptr_write(emu, VTFT, ch, VTFT_FILTERTARGET_MASK);

	snd_emu10k1_ptr_write(emu, CVCF, ch, CVCF_CURRENTFILTER_MASK);

	snd_emu10k1_ptr_write(emu, PTRX, ch, 0);

	snd_emu10k1_ptr_write(emu, CPF, ch, 0);

	snd_emu10k1_ptr_write(emu, CCR, ch, 0);
@@ -74,7 +74,7 @@ void snd_emu10k1_voice_init(struct snd_emu10k1 *emu, int ch) 


	snd_emu10k1_ptr_write(emu, ATKHLDM, ch, 0);

	snd_emu10k1_ptr_write(emu, DCYSUSM, ch, 0);

	snd_emu10k1_ptr_write(emu, IFATN, ch, 0xffff);

	snd_emu10k1_ptr_write(emu, IFATN, ch, IFATN_FILTERCUTOFF_MASK | IFATN_ATTENUATION_MASK);

	snd_emu10k1_ptr_write(emu, PEFE, ch, 0);

	snd_emu10k1_ptr_write(emu, FMMOD, ch, 0);

	snd_emu10k1_ptr_write(emu, TREMFRQ, ch, 24);	/* 1 Hz */
@@ -90,10 +90,10 @@ void snd_emu10k1_voice_init(struct snd_emu10k1 *emu, int ch) 


	/* Audigy extra stuffs */

	if (emu->audigy) {

		snd_emu10k1_ptr_write(emu, 0x4c, ch, 0); /* ?? */

		snd_emu10k1_ptr_write(emu, 0x4d, ch, 0); /* ?? */

		snd_emu10k1_ptr_write(emu, 0x4e, ch, 0); /* ?? */

		snd_emu10k1_ptr_write(emu, 0x4f, ch, 0); /* ?? */

		snd_emu10k1_ptr_write(emu, A_CSBA, ch, 0);

		snd_emu10k1_ptr_write(emu, A_CSDC, ch, 0);

		snd_emu10k1_ptr_write(emu, A_CSFE, ch, 0);

		snd_emu10k1_ptr_write(emu, A_CSHG, ch, 0);

		snd_emu10k1_ptr_write(emu, A_FXRT1, ch, 0x03020100);

		snd_emu10k1_ptr_write(emu, A_FXRT2, ch, 0x3f3f3f3f);

		snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, ch, 0);
@@ -259,7 +259,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir) 


	snd_emu10k1_ptr_write(emu, PTB, 0, emu->ptb_pages.addr);

	snd_emu10k1_ptr_write(emu, TCB, 0, 0);	/* taken from original driver */

	snd_emu10k1_ptr_write(emu, TCBS, 0, 4);	/* taken from original driver */

	snd_emu10k1_ptr_write(emu, TCBS, 0, TCBS_BUFFSIZE_256K);	/* taken from original driver */



	silent_page = (emu->silent_page.addr << emu->address_mode) | (emu->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);

	for (ch = 0; ch < NUM_G; ch++) {
@@ -818,7 +818,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
		/* FPGA netlist already present so clear it */

		/* Return to programming mode */



		snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0x02);

		snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_HANA);

	}

	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);

	dev_dbg(emu->card->dev, "reg2 = 0x%x\n", reg);
@@ -858,36 +858,36 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
	/* Optical -> ADAT I/O  */

	emu->emu1010.optical_in = 1; /* IN_ADAT */

	emu->emu1010.optical_out = 1; /* OUT_ADAT */

	tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |

		(emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);

	tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |

		(emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);

	snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);

	/* Set no attenuation on Audio Dock pads. */

	snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00);

	emu->emu1010.adc_pads = 0x00;

	snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, emu->emu1010.adc_pads);

	/* Unmute Audio dock DACs, Headphone source DAC-4. */

	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);

	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, EMU_HANA_DOCK_PHONES_192_DAC4);

	/* DAC PADs. */

	snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, 0x0f);

	emu->emu1010.dac_pads = 0x0f;

	emu->emu1010.dac_pads = EMU_HANA_DOCK_DAC_PAD1 | EMU_HANA_DOCK_DAC_PAD2 |

				EMU_HANA_DOCK_DAC_PAD3 | EMU_HANA_DOCK_DAC_PAD4;

	snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, emu->emu1010.dac_pads);

	/* SPDIF Format. Set Consumer mode, 24bit, copy enable */

	snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10);

	snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, EMU_HANA_SPDIF_MODE_RX_INVALID);

	/* MIDI routing */

	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);

	/* Unknown. */

	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);

	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, EMU_HANA_MIDI_INA_FROM_HAMOA | EMU_HANA_MIDI_INB_FROM_DOCK2);

	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, EMU_HANA_MIDI_OUT_DOCK2 | EMU_HANA_MIDI_OUT_SYNC2);

	/* IRQ Enable: All on */

	/* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); */

	/* snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x0f); */

	/* IRQ Enable: All off */

	snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);



	emu->emu1010.internal_clock = 1; /* 48000 */

	/* Default WCLK set to 48kHz. */

	snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00);

	snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K);

	/* Word Clock source, Internal 48kHz x1 */

	snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);

	/* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X); */

	/* Audio Dock LEDs. */

	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);

	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, EMU_HANA_DOCK_LEDS_2_LOCK | EMU_HANA_DOCK_LEDS_2_48K);



#if 0

	/* For 96kHz */
@@ -1014,7 +1014,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
		EMU_DST_ALICE_I2S2_LEFT, EMU_SRC_DOCK_ADC3_LEFT1);

	snd_emu1010_fpga_link_dst_src_write(emu,

		EMU_DST_ALICE_I2S2_RIGHT, EMU_SRC_DOCK_ADC3_RIGHT1);

	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x01); /* Unmute all */

	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);



#if 0

	snd_emu1010_fpga_link_dst_src_write(emu,

sound/pci/emu10k1/emufx.c

+3 −3
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
	gpr += 2;



	/* mic capture buffer */	

	A_OP(icode, &ptr, iINTERP, A_EXTOUT(A_EXTOUT_MIC_CAP), A_EXTIN(A_EXTIN_AC97_L), 0xcd, A_EXTIN(A_EXTIN_AC97_R));

	A_OP(icode, &ptr, iINTERP, A_EXTOUT(A_EXTOUT_MIC_CAP), A_EXTIN(A_EXTIN_AC97_L), A_C_40000000, A_EXTIN(A_EXTIN_AC97_R));



	/* Audigy CD Playback Volume */

	A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_SPDIF_CD_L);
@@ -1438,7 +1438,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 


	/* Stereo Mix Center Playback */

	/* Center = sub = Left/2 + Right/2 */

	A_OP(icode, &ptr, iINTERP, A_GPR(tmp), A_GPR(stereo_mix), 0xcd, A_GPR(stereo_mix+1));

	A_OP(icode, &ptr, iINTERP, A_GPR(tmp), A_GPR(stereo_mix), A_C_40000000, A_GPR(stereo_mix+1));

	A_OP(icode, &ptr, iMAC0, A_GPR(playback+4), A_GPR(playback+4), A_GPR(gpr), A_GPR(tmp));

	snd_emu10k1_init_mono_control(&controls[nctl++], "Center Playback Volume", gpr, 0);

	gpr++;
@@ -2478,7 +2478,7 @@ int snd_emu10k1_fx8010_tram_setup(struct snd_emu10k1 *emu, u32 size) 
	outl(HCFG_LOCKTANKCACHE_MASK | inl(emu->port + HCFG), emu->port + HCFG);

	spin_unlock_irq(&emu->emu_lock);

	snd_emu10k1_ptr_write(emu, TCB, 0, 0);

	snd_emu10k1_ptr_write(emu, TCBS, 0, 0);

	snd_emu10k1_ptr_write(emu, TCBS, 0, TCBS_BUFFSIZE_16K);

	if (emu->fx8010.etram_pages.area != NULL) {

		snd_dma_free_pages(&emu->fx8010.etram_pages);

		emu->fx8010.etram_pages.area = NULL;

sound/pci/emu10k1/emumixer.c

+4 −4
Original line number Diff line number Diff line
@@ -827,8 +827,8 @@ static int snd_emu1010_optical_out_put(struct snd_kcontrol *kcontrol, 
	change = (emu->emu1010.optical_out != val);

	if (change) {

		emu->emu1010.optical_out = val;

		tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |

			(emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);

		tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |

			(emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);

		snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);

	}

	return change;
@@ -878,8 +878,8 @@ static int snd_emu1010_optical_in_put(struct snd_kcontrol *kcontrol, 
	change = (emu->emu1010.optical_in != val);

	if (change) {

		emu->emu1010.optical_in = val;

		tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |

			(emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);

		tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |

			(emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);

		snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);

	}

	return change;

sound/pci/emu10k1/emupcm.c

+6 −6
Original line number Diff line number Diff line
@@ -352,8 +352,8 @@ static void snd_emu10k1_pcm_init_voice(struct snd_emu10k1 *emu, 
	snd_emu10k1_ptr_write(emu, MAPA, voice, silent_page);

	snd_emu10k1_ptr_write(emu, MAPB, voice, silent_page);

	/* modulation envelope */

	snd_emu10k1_ptr_write(emu, CVCF, voice, 0xffff);

	snd_emu10k1_ptr_write(emu, VTFT, voice, 0xffff);

	snd_emu10k1_ptr_write(emu, VTFT, voice, VTFT_FILTERTARGET_MASK);

	snd_emu10k1_ptr_write(emu, CVCF, voice, CVCF_CURRENTFILTER_MASK);

	snd_emu10k1_ptr_write(emu, ATKHLDM, voice, 0);

	snd_emu10k1_ptr_write(emu, DCYSUSM, voice, 0x007f);

	snd_emu10k1_ptr_write(emu, LFOVAL1, voice, 0x8000);
@@ -621,8 +621,8 @@ static void snd_emu10k1_playback_prepare_voice(struct snd_emu10k1 *emu, struct s 
	tmp = runtime->channels == 2 ? (master ? 1 : 2) : 0;

	vattn = mix != NULL ? (mix->attn[tmp] << 16) : 0;

	snd_emu10k1_ptr_write(emu, IFATN, voice, attn);

	snd_emu10k1_ptr_write(emu, VTFT, voice, vattn | 0xffff);

	snd_emu10k1_ptr_write(emu, CVCF, voice, vattn | 0xffff);

	snd_emu10k1_ptr_write(emu, VTFT, voice, vattn | VTFT_FILTERTARGET_MASK);

	snd_emu10k1_ptr_write(emu, CVCF, voice, vattn | CVCF_CURRENTFILTER_MASK);

	snd_emu10k1_ptr_write(emu, DCYSUSV, voice, 0x7f7f);

	snd_emu10k1_voice_clear_loop_stop(emu, voice);

}
@@ -663,8 +663,8 @@ static void snd_emu10k1_playback_stop_voice(struct snd_emu10k1 *emu, struct snd_ 
	snd_emu10k1_ptr_write(emu, PTRX_PITCHTARGET, voice, 0);

	snd_emu10k1_ptr_write(emu, CPF_CURRENTPITCH, voice, 0);

	snd_emu10k1_ptr_write(emu, IFATN, voice, 0xffff);

	snd_emu10k1_ptr_write(emu, VTFT, voice, 0xffff);

	snd_emu10k1_ptr_write(emu, CVCF, voice, 0xffff);

	snd_emu10k1_ptr_write(emu, VTFT, voice, VTFT_FILTERTARGET_MASK);

	snd_emu10k1_ptr_write(emu, CVCF, voice, CVCF_CURRENTFILTER_MASK);

	snd_emu10k1_ptr_write(emu, IP, voice, 0);

}