Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: klem.dev@gmail.com
To: patch@alsa-project.org
Cc: "Clément Guedez" <klem.dev@gmail.com>, alsa-devel@alsa-project.org
Subject: [PATCH 5/6] ESI W192M : Add text Line in/Mic for selecting input gain state
Date: Sat, 14 Mar 2015 03:31:41 +0100	[thread overview]
Message-ID: <55039da3.6a07c20a.1b00.ffffa602@mx.google.com> (raw)
In-Reply-To: <1426300302-20542-1-git-send-email-me>

From: Clément Guedez <klem.dev@gmail.com>

Add text Line in/Mic for selecting input gain state in mixer for ESI W192M.

Signed-off-by: Clément Guedez <klem.dev@gmail.com>

diff --git a/sound/pci/ice1712/wtm.c b/sound/pci/ice1712/wtm.c
index 3af9daf..497ff1a 100644
--- a/sound/pci/ice1712/wtm.c
+++ b/sound/pci/ice1712/wtm.c
@@ -339,8 +339,23 @@ static int stac9460_adc_vol_put(struct snd_kcontrol *kcontrol,
 /*
  * MIC / LINE switch fonction
  */
+static int stac9460_mic_sw_info(struct snd_kcontrol *kcontrol,
+				struct snd_ctl_elem_info *uinfo)
+{
+	static char *texts[2] = { "Line In", "Mic" };
+
+	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+	uinfo->count = 1;
+	uinfo->value.enumerated.items = 2;
+	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+		uinfo->value.enumerated.item = uinfo->value.enumerated.items
+		- 1;
+	strcpy(uinfo->value.enumerated.name,
+		texts[uinfo->value.enumerated.item]);
+
+	return 0;
+}
 
-#define stac9460_mic_sw_info		snd_ctl_boolean_mono_info
 
 static int stac9460_mic_sw_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
@@ -354,7 +369,7 @@ static int stac9460_mic_sw_get(struct snd_kcontrol *kcontrol,
 		val = stac9460_get(ice, STAC946X_GENERAL_PURPOSE);
 	else
 		val = stac9460_2_get(ice, STAC946X_GENERAL_PURPOSE);
-	ucontrol->value.integer.value[0] = ~val>>7 & 0x1;
+	ucontrol->value.enumerated.item[0] = (val >> 7) & 0x1;
 	return 0;
 }
 
@@ -370,7 +385,7 @@ static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol,
 		old = stac9460_get(ice, STAC946X_GENERAL_PURPOSE);
 	else
 		old = stac9460_2_get(ice, STAC946X_GENERAL_PURPOSE);
-	new = (~ucontrol->value.integer.value[0] << 7 & 0x80) | (old & ~0x80);
+	new = (ucontrol->value.enumerated.item[0] << 7 & 0x80) | (old & ~0x80);
 	change = (new != old);
 	if (change) {
 		if (id == 0)
-- 
2.1.4

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  parent reply	other threads:[~2015-03-14  2:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1426300302-20542-1-git-send-email-me>
2015-03-14  2:31 ` [PATCH 2/6] ESI W192M : Update eeprom structure to C99 standard klem.dev
2015-03-14  2:31 ` [PATCH 3/6] ESI W192M : Enable midi i/o port for envy24 chip klem.dev
2015-03-14  2:31 ` [PATCH 4/6] ESI W192M : Add TLV support to control volume using dB scale klem.dev
2015-03-14  4:01   ` Clément Guedez
2015-03-14  8:11     ` Takashi Iwai
2015-03-14  2:31 ` klem.dev [this message]
2015-03-14  8:10   ` [PATCH 5/6] ESI W192M : Add text Line in/Mic for selecting input gain state Takashi Iwai
2015-03-14 13:45     ` Clément Guedez
2015-03-14  2:31 ` [PATCH 6/6] ESI W192M : Add sampling rate control of the ADC/DAC klem.dev
2015-03-14  4:02   ` Clément Guedez
     [not found] <1426465255-19005-1-git-send-email-me>
2015-03-16  0:20 ` [PATCH 5/6] ESI W192M : Add text Line in/Mic for selecting input gain state klem.dev
2015-03-16  7:51   ` Takashi Iwai
2015-03-16 14:54     ` Clément Guedez
2015-03-16 14:55       ` Takashi Iwai
     [not found] <1426641991-3694-1-git-send-email-me>
2015-03-18  1:26 ` klem.dev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=55039da3.6a07c20a.1b00.ffffa602@mx.google.com \
    --to=klem.dev@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=patch@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox