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

Commit c6ff77f7 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Add dB scale information to pcxhr driver 



Added the dB scale information to pcxhr driver.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 3479307f

sound/pci/pcxhr/pcxhr_mixer.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "pcxhr_hwdep.h"

#include "pcxhr_hwdep.h"

#include "pcxhr_core.h"

#include "pcxhr_core.h"

#include <sound/control.h>

#include <sound/control.h>

#include <sound/tlv.h>

#include <sound/asoundef.h>

#include <sound/asoundef.h>

#include "pcxhr_mixer.h"

#include "pcxhr_mixer.h"
@@ -43,6 +44,9 @@ 
#define PCXHR_ANALOG_PLAYBACK_LEVEL_MAX  128	/*    0.0 dB */

#define PCXHR_ANALOG_PLAYBACK_LEVEL_MAX  128	/*    0.0 dB */

#define PCXHR_ANALOG_PLAYBACK_ZERO_LEVEL 104	/*  -24.0 dB ( 0.0 dB - fix level +24.0 dB ) */

#define PCXHR_ANALOG_PLAYBACK_ZERO_LEVEL 104	/*  -24.0 dB ( 0.0 dB - fix level +24.0 dB ) */





static DECLARE_TLV_DB_SCALE(db_scale_analog_capture, -9600, 50, 0);

static DECLARE_TLV_DB_SCALE(db_scale_analog_playback, -12800, 100, 0);



static int pcxhr_update_analog_audio_level(struct snd_pcxhr *chip, int is_capture, int channel)

static int pcxhr_update_analog_audio_level(struct snd_pcxhr *chip, int is_capture, int channel)

{

{

	int err, vol;

	int err, vol;
@@ -130,10 +134,13 @@ static int pcxhr_analog_vol_put(struct snd_kcontrol *kcontrol, 




static struct snd_kcontrol_new pcxhr_control_analog_level = {

static struct snd_kcontrol_new pcxhr_control_analog_level = {

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.access =	(SNDRV_CTL_ELEM_ACCESS_READWRITE |

			 SNDRV_CTL_ELEM_ACCESS_TLV_READ),

	/* name will be filled later */

	/* name will be filled later */

	.info =		pcxhr_analog_vol_info,

	.info =		pcxhr_analog_vol_info,

	.get =		pcxhr_analog_vol_get,

	.get =		pcxhr_analog_vol_get,

	.put =		pcxhr_analog_vol_put,

	.put =		pcxhr_analog_vol_put,

	/* tlv will be filled later */

};

};





/* shared */

/* shared */
@@ -188,6 +195,7 @@ static struct snd_kcontrol_new pcxhr_control_output_switch = { 
#define PCXHR_DIGITAL_LEVEL_MAX		0x1ff	/* +18 dB */

#define PCXHR_DIGITAL_LEVEL_MAX		0x1ff	/* +18 dB */

#define PCXHR_DIGITAL_ZERO_LEVEL	0x1b7	/*  0 dB */

#define PCXHR_DIGITAL_ZERO_LEVEL	0x1b7	/*  0 dB */





static DECLARE_TLV_DB_SCALE(db_scale_digital, -10950, 50, 0);





#define MORE_THAN_ONE_STREAM_LEVEL	0x000001

#define MORE_THAN_ONE_STREAM_LEVEL	0x000001

#define VALID_STREAM_PAN_LEVEL_MASK	0x800000

#define VALID_STREAM_PAN_LEVEL_MASK	0x800000
@@ -343,11 +351,14 @@ static int pcxhr_pcm_vol_put(struct snd_kcontrol *kcontrol, 
static struct snd_kcontrol_new snd_pcxhr_pcm_vol =

static struct snd_kcontrol_new snd_pcxhr_pcm_vol =

{

{

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.access =	(SNDRV_CTL_ELEM_ACCESS_READWRITE |

			 SNDRV_CTL_ELEM_ACCESS_TLV_READ),

	/* name will be filled later */

	/* name will be filled later */

	/* count will be filled later */

	/* count will be filled later */

	.info =		pcxhr_digital_vol_info,		/* shared */

	.info =		pcxhr_digital_vol_info,		/* shared */

	.get =		pcxhr_pcm_vol_get,

	.get =		pcxhr_pcm_vol_get,

	.put =		pcxhr_pcm_vol_put,

	.put =		pcxhr_pcm_vol_put,

	.tlv = { .p = db_scale_digital },

};

};
@@ -433,10 +444,13 @@ static int pcxhr_monitor_vol_put(struct snd_kcontrol *kcontrol, 




static struct snd_kcontrol_new pcxhr_control_monitor_vol = {

static struct snd_kcontrol_new pcxhr_control_monitor_vol = {

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.access =	(SNDRV_CTL_ELEM_ACCESS_READWRITE |

			 SNDRV_CTL_ELEM_ACCESS_TLV_READ),

	.name =         "Monitoring Volume",

	.name =         "Monitoring Volume",

	.info =		pcxhr_digital_vol_info,		/* shared */

	.info =		pcxhr_digital_vol_info,		/* shared */

	.get =		pcxhr_monitor_vol_get,

	.get =		pcxhr_monitor_vol_get,

	.put =		pcxhr_monitor_vol_put,

	.put =		pcxhr_monitor_vol_put,

	.tlv = { .p = db_scale_digital },

};

};





/*

/*
@@ -928,6 +942,7 @@ int pcxhr_create_mixer(struct pcxhr_mgr *mgr) 
			temp = pcxhr_control_analog_level;

			temp = pcxhr_control_analog_level;

			temp.name = "Master Playback Volume";

			temp.name = "Master Playback Volume";

			temp.private_value = 0; /* playback */

			temp.private_value = 0; /* playback */

			temp.tlv.p = db_scale_analog_playback;

			if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

			if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

				return err;

				return err;

			/* output mute controls */

			/* output mute controls */
@@ -963,6 +978,7 @@ int pcxhr_create_mixer(struct pcxhr_mgr *mgr) 
			temp = pcxhr_control_analog_level;

			temp = pcxhr_control_analog_level;

			temp.name = "Master Capture Volume";

			temp.name = "Master Capture Volume";

			temp.private_value = 1; /* capture */

			temp.private_value = 1; /* capture */

			temp.tlv.p = db_scale_analog_capture;

			if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

			if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

				return err;

				return err;