Commit 7002cbd6 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Takashi Iwai
Browse files

ALSA: emu10k1: use high-level I/O in set_filterQ() 



This makes the code shorter and more legible.

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


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

include/sound/emu10k1.h

+2 −1
Original line number Diff line number Diff line
@@ -429,7 +429,8 @@ 
#define DSL_LOOPENDADDR		0x18000007



#define CCCA			0x08		/* Filter Q, interp. ROM, byte size, cur. addr register */

#define CCCA_RESONANCE		0xf0000000	/* Lowpass filter resonance (Q) height			*/

#define CCCA_RESONANCE_MASK	0xf0000000	/* Lowpass filter resonance (Q) height			*/

#define CCCA_RESONANCE		0x041c0008

#define CCCA_INTERPROM_MASK	0x0e000000	/* Selects passband of interpolation ROM		*/

						/* 1 == full band, 7 == lowpass				*/

						/* ROM 0 is used when pitch shifting downward or less	*/

sound/pci/emu10k1/emu10k1_callback.c

+1 −4
Original line number Diff line number Diff line
@@ -531,8 +531,5 @@ set_fm2frq2(struct snd_emu10k1 *hw, struct snd_emux_voice *vp) 
static void

set_filterQ(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)

{

	unsigned int val;

	val = snd_emu10k1_ptr_read(hw, CCCA, vp->ch) & ~CCCA_RESONANCE;

	val |= (vp->reg.parm.filterQ << 28);

	snd_emu10k1_ptr_write(hw, CCCA, vp->ch, val);

	snd_emu10k1_ptr_write(hw, CCCA_RESONANCE, vp->ch, vp->reg.parm.filterQ);

}