Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97e08f5d authored by Stas Sergeev's avatar Stas Sergeev Committed by Takashi Iwai
Browse files

[ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number 



This solves the problem with mixers wrongly displaying the PWM freq.

Signed-off-by: default avatarStas Sergeev <stsp@aknet.ru>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 97ec710c

sound/drivers/pcsp/pcsp.h

+4 −2
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ static DEFINE_SPINLOCK(i8253_lock); 
/* default timer freq for PC-Speaker: 18643 Hz */

#define DIV_18KHZ 64

#define MAX_DIV DIV_18KHZ

#define CUR_DIV() (MAX_DIV >> chip->treble)

#define CALC_DIV(d) (MAX_DIV >> (d))

#define CUR_DIV() CALC_DIV(chip->treble)

#define PCSP_MAX_TREBLE 1



/* unfortunately, with hrtimers 37KHz does not work very well :( */
@@ -36,7 +37,8 @@ static DEFINE_SPINLOCK(i8253_lock); 
#define PCSP_DEFAULT_SDIV (DIV_18KHZ >> 1)

#define PCSP_DEFAULT_SRATE (PIT_TICK_RATE / PCSP_DEFAULT_SDIV)

#define PCSP_INDEX_INC() (1 << (PCSP_MAX_TREBLE - chip->treble))

#define PCSP_RATE() (PIT_TICK_RATE / CUR_DIV())

#define PCSP_CALC_RATE(i) (PIT_TICK_RATE / CALC_DIV(i))

#define PCSP_RATE() PCSP_CALC_RATE(chip->treble)

#define PCSP_MIN_RATE__1 MAX_DIV/PIT_TICK_RATE

#define PCSP_MAX_RATE__1 MIN_DIV/PIT_TICK_RATE

#define PCSP_MAX_PERIOD_NS (1000000000ULL * PCSP_MIN_RATE__1)

sound/drivers/pcsp/pcsp_mixer.c

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol, 
	uinfo->value.enumerated.items = chip->max_treble + 1;

	if (uinfo->value.enumerated.item > chip->max_treble)

		uinfo->value.enumerated.item = chip->max_treble;

	sprintf(uinfo->value.enumerated.name, "%d", PCSP_RATE());

	sprintf(uinfo->value.enumerated.name, "%d",

			PCSP_CALC_RATE(uinfo->value.enumerated.item));

	return 0;

}