Skip to content

Commit ac9219d

Browse files
ossilatortiwai
authored andcommitted
ALSA: emu10k1: remove some bogus defines
Firstly, remove the FXWC_* defines - the comment on FXWC implies that the relevant defines are the (A_)EXTOUT_* ones. It's unclear where this came from - it was in the initial ALSA import, but neither the driver from Creative nor kX-project have these defines. Secondly, remove A_HR, which made plain no sense (was unused, and clashed with FXRT). Amends commit cbb7d8f ("emu10k1: Update registers defines for the Audigy 2/emu10k2.5"). Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Link: https://lore.kernel.org/r/20230422161021.1143903-5-oswald.buddenhagen@gmx.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent a062b10 commit ac9219d

2 files changed

Lines changed: 0 additions & 16 deletions

File tree

include/sound/emu10k1.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@
471471
#define FXRT_CHANNELC 0x0f000000 /* Effects send bus number for channel's effects send C */
472472
#define FXRT_CHANNELD 0xf0000000 /* Effects send bus number for channel's effects send D */
473473

474-
#define A_HR 0x0b /* High Resolution. 24bit playback from host to DSP. */
475474
#define MAPA 0x0c /* Cache map A */
476475
#define MAPB 0x0d /* Cache map B */
477476

@@ -626,20 +625,6 @@
626625
/* is 16bit, 48KHz only. All 32 channels can be enabled */
627626
/* simultaneously. */
628627

629-
#define FXWC_DEFAULTROUTE_C (1<<0) /* left emu out? */
630-
#define FXWC_DEFAULTROUTE_B (1<<1) /* right emu out? */
631-
#define FXWC_DEFAULTROUTE_A (1<<12)
632-
#define FXWC_DEFAULTROUTE_D (1<<13)
633-
#define FXWC_ADCLEFT (1<<18)
634-
#define FXWC_CDROMSPDIFLEFT (1<<18)
635-
#define FXWC_ADCRIGHT (1<<19)
636-
#define FXWC_CDROMSPDIFRIGHT (1<<19)
637-
#define FXWC_MIC (1<<20)
638-
#define FXWC_ZOOMLEFT (1<<20)
639-
#define FXWC_ZOOMRIGHT (1<<21)
640-
#define FXWC_SPDIFLEFT (1<<22) /* 0x00400000 */
641-
#define FXWC_SPDIFRIGHT (1<<23) /* 0x00800000 */
642-
643628
#define A_TBLSZ 0x43 /* Effects Tank Internal Table Size. Only low byte or register used */
644629

645630
#define TCBS 0x44 /* Tank cache buffer size register */

sound/pci/emu10k1/emupcm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1745,7 +1745,6 @@ int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device)
17451745
* to these
17461746
*/
17471747

1748-
/* emu->efx_voices_mask[0] = FXWC_DEFAULTROUTE_C | FXWC_DEFAULTROUTE_A; */
17491748
if (emu->audigy) {
17501749
emu->efx_voices_mask[0] = 0;
17511750
if (emu->card_capabilities->emu_model)

0 commit comments

Comments
 (0)