From: Takashi Iwai Subject: Re: Tests of the hda-jack branch Date: Wed, 30 Nov 2011 07:46:08 +0100 Message-ID: References: <4ED535CA.1080108@canonical.com> <4ED545E1.3040409@ladisch.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 5589B103B01 for ; Wed, 30 Nov 2011 07:46:11 +0100 (CET) In-Reply-To: <4ED545E1.3040409@ladisch.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Clemens Ladisch Cc: ALSA Development Mailing List , David Henningsson List-Id: alsa-devel@alsa-project.org At Tue, 29 Nov 2011 21:51:45 +0100, Clemens Ladisch wrote: > > David Henningsson wrote: > > ... two patches - one adds a "device index" for mapping against pcm > > devices on HDMI, > > > + kctl->id.device = device; > > In the general case, there is not always a 1:1 mapping between jacks and > PCM devices, so I fear that a jack belonging to device 0 cannot be > distinguished from a jack that has no specific device. Hm, a good point. > There is a convention that id.device is a valid PCM device number if and > only if id.iface is IFACE_PCM. However, it might be useful to map > controls with IFACE_MIXER to PCM devices, so I'd propose a new TLV, like > in the incomplete patch below. Yes, I had a similar idea. My original idea was to implement PCM mappings like this and dependency-mapping between control elements (e.g. master -> front -> speaker) via TLV. Takashi > > > Regards, > Clemens > > > --- a/include/sound/tlv.h > +++ b/include/sound/tlv.h > @@ -37,6 +37,7 @@ > #define SNDRV_CTL_TLVT_DB_RANGE 3 /* dB range container */ > #define SNDRV_CTL_TLVT_DB_MINMAX 4 /* dB scale with min/max */ > #define SNDRV_CTL_TLVT_DB_MINMAX_MUTE 5 /* dB scale with min/max with mute */ > +#define SNDRV_CTL_TLVT_PCM_DEVICE 6 /* jack (or other control?) maps to this device */ > > #define _TLV_ITEM(type, ...) \ > (type), _TLV_LENGTH(__VA_ARGS__), __VA_ARGS__ > @@ -81,4 +82,9 @@ > > #define TLV_DB_GAIN_MUTE -9999999 > > +#define TLB_PCM_DEVICE_NUMBER_ITEM(devno) \ > + SNDRV_CTL_TLVT_PCM_DEVICE, 1 * sizeof(unsigned int), (devno) > +#define DECLARE_TLV_PCM_DEVICE_NUMBER(name, devno) \ > + unsigned int name[] = { TLV_PCM_DEVICE_NUMBER_ITEM(devno) } > + > #endif /* __SOUND_TLV_H */ > --- a/sound/pci/hda/hda_jack.c > +++ b/sound/pci/hda/hda_jack.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > #include "hda_codec.h" > #include "hda_local.h" > #include "hda_jack.h" > @@ -210,7 +211,7 @@ EXPORT_SYMBOL_HDA(snd_hda_jack_report_sync); > * will have the given name and index. > */ > int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid, > - const char *name, int idx) > + const char *name, int idx, int device) > { > struct hda_jack_tbl *jack; > struct snd_kcontrol *kctl; > @@ -223,6 +224,11 @@ int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid, > kctl = snd_kctl_jack_new(name, idx, codec); > if (!kctl) > return -ENOMEM; > + jack->tlv[0] = SNDRV_CTL_TLVT_PCM_DEVICE; > + jack->tlv[1] = 1 * sizeof(unsigned int); > + jack->tlv[2] = device; > + kctl->tlv.p = jack->tlv; > + kctl->access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ; > if (snd_hda_ctl_add(codec, nid, kctl) < 0) > return -ENOMEM; > jack->kctl = kctl; > @@ -249,7 +255,7 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid, > return 0; > > snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx); > - err = snd_hda_jack_add_kctl(codec, nid, name, idx); > + err = snd_hda_jack_add_kctl(codec, nid, name, idx, 0); > if (err < 0) > return err; > return snd_hda_jack_detect_enable(codec, nid, 0); > --- a/sound/pci/hda/hda_jack.h > +++ b/sound/pci/hda/hda_jack.h > @@ -22,6 +22,7 @@ struct hda_jack_tbl { > unsigned int jack_detect:1; /* capable of jack-detection? */ > unsigned int jack_dirty:1; /* needs to update? */ > struct snd_kcontrol *kctl; /* assigned kctl for jack-detection */ > + unsigned int tlv[3]; > #ifdef CONFIG_SND_HDA_INPUT_JACK > int type; > struct snd_jack *jack; > @@ -76,7 +77,7 @@ static inline bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid) > } > > int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid, > - const char *name, int idx); > + const char *name, int idx, int device); > int snd_hda_jack_add_kctls(struct hda_codec *codec, > const struct auto_pin_cfg *cfg); >