January 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] drm: sti: allow audio playback on HDMI even if disabled.
by Arnaud Pouliquen 04 Jan '17

04 Jan '17

This fix allows to play audio while HDMI is disconnected. When HDMI is disable, audio configuration is stored and samples are dropped (by HDMI IP). When HDMI is enabled, audio HDMI configuration is applied and samples are outputted on HDMI wire. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> --- drivers/gpu/drm/sti/sti_hdmi.c | 205 ++++++++++++++++++++--------------------- 1 file changed, 101 insertions(+), 104 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index 376b076..9c0025e 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -788,6 +788,95 @@ static void sti_hdmi_disable(struct drm_bridge *bridge) hdmi->enabled = false; } +/** + * sti_hdmi_audio_get_non_coherent_n() - get N parameter for non-coherent + * clocks. None-coherent clocks means that audio and TMDS clocks have not the + * same source (drifts between clocks). In this case assumption is that CTS is + * automatically calculated by hardware. + * + * @audio_fs: audio frame clock frequency in Hz + * + * Values computed are based on table described in HDMI specification 1.4b + * + * Returns n value. + */ +static int sti_hdmi_audio_get_non_coherent_n(unsigned int audio_fs) +{ + unsigned int n; + + switch (audio_fs) { + case 32000: + n = 4096; + break; + case 44100: + n = 6272; + break; + case 48000: + n = 6144; + break; + case 88200: + n = 6272 * 2; + break; + case 96000: + n = 6144 * 2; + break; + case 176400: + n = 6272 * 4; + break; + case 192000: + n = 6144 * 4; + break; + default: + /* Not pre-defined, recommended value: 128 * fs / 1000 */ + n = (audio_fs * 128) / 1000; + } + + return n; +} + +static int hdmi_audio_configure(struct sti_hdmi *hdmi) +{ + int audio_cfg, n; + struct hdmi_audio_params *params = &hdmi->audio; + struct hdmi_audio_infoframe *info = &params->cea; + + DRM_DEBUG_DRIVER("\n"); + + if (!hdmi->enabled) + return 0; + + /* update N parameter */ + n = sti_hdmi_audio_get_non_coherent_n(params->sample_rate); + + DRM_DEBUG_DRIVER("Audio rate = %d Hz, TMDS clock = %d Hz, n = %d\n", + params->sample_rate, hdmi->mode.clock * 1000, n); + hdmi_write(hdmi, n, HDMI_AUDN); + + /* update HDMI registers according to configuration */ + audio_cfg = HDMI_AUD_CFG_SPDIF_DIV_2 | HDMI_AUD_CFG_DTS_INVALID | + HDMI_AUD_CFG_ONE_BIT_INVALID; + + switch (info->channels) { + case 8: + audio_cfg |= HDMI_AUD_CFG_CH78_VALID; + case 6: + audio_cfg |= HDMI_AUD_CFG_CH56_VALID; + case 4: + audio_cfg |= HDMI_AUD_CFG_CH34_VALID | HDMI_AUD_CFG_8CH; + case 2: + audio_cfg |= HDMI_AUD_CFG_CH12_VALID; + break; + default: + DRM_ERROR("ERROR: Unsupported number of channels (%d)!\n", + info->channels); + return -EINVAL; + } + + hdmi_write(hdmi, audio_cfg, HDMI_AUDIO_CFG); + + return hdmi_audio_infoframe_config(hdmi); +} + static void sti_hdmi_pre_enable(struct drm_bridge *bridge) { struct sti_hdmi *hdmi = bridge->driver_private; @@ -826,9 +915,12 @@ static void sti_hdmi_pre_enable(struct drm_bridge *bridge) if (hdmi_avi_infoframe_config(hdmi)) DRM_ERROR("Unable to configure AVI infoframe\n"); - /* Program AUDIO infoframe */ - if (hdmi_audio_infoframe_config(hdmi)) - DRM_ERROR("Unable to configure AUDIO infoframe\n"); + if (hdmi->audio.enabled) { + if (hdmi_audio_configure(hdmi)) + DRM_ERROR("Unable to configure audio\n"); + } else { + hdmi_audio_infoframe_config(hdmi); + } /* Program VS infoframe */ if (hdmi_vendor_infoframe_config(hdmi)) @@ -1078,97 +1170,6 @@ static struct drm_encoder *sti_hdmi_find_encoder(struct drm_device *dev) return NULL; } -/** - * sti_hdmi_audio_get_non_coherent_n() - get N parameter for non-coherent - * clocks. None-coherent clocks means that audio and TMDS clocks have not the - * same source (drifts between clocks). In this case assumption is that CTS is - * automatically calculated by hardware. - * - * @audio_fs: audio frame clock frequency in Hz - * - * Values computed are based on table described in HDMI specification 1.4b - * - * Returns n value. - */ -static int sti_hdmi_audio_get_non_coherent_n(unsigned int audio_fs) -{ - unsigned int n; - - switch (audio_fs) { - case 32000: - n = 4096; - break; - case 44100: - n = 6272; - break; - case 48000: - n = 6144; - break; - case 88200: - n = 6272 * 2; - break; - case 96000: - n = 6144 * 2; - break; - case 176400: - n = 6272 * 4; - break; - case 192000: - n = 6144 * 4; - break; - default: - /* Not pre-defined, recommended value: 128 * fs / 1000 */ - n = (audio_fs * 128) / 1000; - } - - return n; -} - -static int hdmi_audio_configure(struct sti_hdmi *hdmi, - struct hdmi_audio_params *params) -{ - int audio_cfg, n; - struct hdmi_audio_infoframe *info = &params->cea; - - DRM_DEBUG_DRIVER("\n"); - - if (!hdmi->enabled) - return 0; - - /* update N parameter */ - n = sti_hdmi_audio_get_non_coherent_n(params->sample_rate); - - DRM_DEBUG_DRIVER("Audio rate = %d Hz, TMDS clock = %d Hz, n = %d\n", - params->sample_rate, hdmi->mode.clock * 1000, n); - hdmi_write(hdmi, n, HDMI_AUDN); - - /* update HDMI registers according to configuration */ - audio_cfg = HDMI_AUD_CFG_SPDIF_DIV_2 | HDMI_AUD_CFG_DTS_INVALID | - HDMI_AUD_CFG_ONE_BIT_INVALID; - - switch (info->channels) { - case 8: - audio_cfg |= HDMI_AUD_CFG_CH78_VALID; - case 6: - audio_cfg |= HDMI_AUD_CFG_CH56_VALID; - case 4: - audio_cfg |= HDMI_AUD_CFG_CH34_VALID | HDMI_AUD_CFG_8CH; - case 2: - audio_cfg |= HDMI_AUD_CFG_CH12_VALID; - break; - default: - DRM_ERROR("ERROR: Unsupported number of channels (%d)!\n", - info->channels); - return -EINVAL; - } - - hdmi_write(hdmi, audio_cfg, HDMI_AUDIO_CFG); - - hdmi->audio = *params; - - return hdmi_audio_infoframe_config(hdmi); -} - static void hdmi_audio_shutdown(struct device *dev, void *data) { struct sti_hdmi *hdmi = dev_get_drvdata(dev); @@ -1192,17 +1193,9 @@ static int hdmi_audio_hw_params(struct device *dev, { struct sti_hdmi *hdmi = dev_get_drvdata(dev); int ret; - struct hdmi_audio_params audio = { - .sample_width = params->sample_width, - .sample_rate = params->sample_rate, - .cea = params->cea, - }; DRM_DEBUG_DRIVER("\n"); - if (!hdmi->enabled) - return 0; - if ((daifmt->fmt != HDMI_I2S) || daifmt->bit_clk_inv || daifmt->frame_clk_inv || daifmt->bit_clk_master || daifmt->frame_clk_master) { @@ -1213,9 +1206,13 @@ static int hdmi_audio_hw_params(struct device *dev, return -EINVAL; } - audio.enabled = true; + hdmi->audio.sample_width = params->sample_width; + hdmi->audio.sample_rate = params->sample_rate; + hdmi->audio.cea = params->cea; + + hdmi->audio.enabled = true; - ret = hdmi_audio_configure(hdmi, &audio); + ret = hdmi_audio_configure(hdmi); if (ret < 0) return ret; -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC : fsl_ssi : Correct the condition to check AC97 mode
by Harisangam, Sharvari (S.) 04 Jan '17

04 Jan '17

Corrected the condition to check if ssi is configured for AC97 mode. Other modes like dsp_a also satisfy the ANDing condition. Signed-off-by: Sharvari Harisangam <sharvari.harisangam(a)visteon.com> --- sound/soc/fsl/fsl_ssi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index ca6f6b1..4fbb7a2 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -317,7 +317,8 @@ MODULE_DEVICE_TABLE(of, fsl_ssi_ids); static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private) { - return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97); + return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97) == + SND_SOC_DAIFMT_AC97; } static bool fsl_ssi_is_i2s_master(struct fsl_ssi_private *ssi_private) @@ -1016,7 +1017,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, CCSR_SSI_SCR_TCH_EN); } - if (fmt & SND_SOC_DAIFMT_AC97) + if ((fmt & SND_SOC_DAIFMT_AC97) == SND_SOC_DAIFMT_AC97) fsl_ssi_setup_ac97(ssi_private); return 0; -- 2.7.4

5 5

[alsa-devel] [PATCH - alsa-lib 1/1] conf/cards: add support for pistachio-card.
by manohar.narkhede＠imgtec.com 04 Jan '17

04 Jan '17

From: Manohar Narkhede <Manohar.Narkhede(a)imgtec.com> The data sheet of the chip and technical reference manual can be found at https://docs.creatordev.io/ci40/guides/hardwaredocs/cXT200_datasheet2.pdf and https://docs.creatordev.io/ci40/guides/hardwaredocs/MIPS_Creator_cXT200_Tec…. The additional information about the cards can be found in src/conf/cards/pistachio-card.conf file. Signed-off-by: Manohar Narkhede <Manohar.Narkhede(a)imgtec.com> diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am index 008d399..60b5309 100644 --- a/src/conf/cards/Makefile.am +++ b/src/conf/cards/Makefile.am @@ -39,6 +39,7 @@ cfg_files = aliases.conf \ Maestro3.conf \ NFORCE.conf \ PC-Speaker.conf \ + pistachio-card.conf \ PMac.conf \ PMacToonie.conf \ PS3.conf \ diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf index 4a92fb2..60f9d26 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -55,6 +55,7 @@ AV100 cards.CMI8788 AV200 cards.CMI8788 CMI8786 cards.CMI8788 CMI8787 cards.CMI8788 +pistachio cards.pistachio-card <confdir:pcm/default.conf> <confdir:pcm/dmix.conf> diff --git a/src/conf/cards/pistachio-card.conf b/src/conf/cards/pistachio-card.conf new file mode 100644 index 0000000..80e8013 --- /dev/null +++ b/src/conf/cards/pistachio-card.conf @@ -0,0 +1,58 @@ +# +# Configuration for the pistachio chip. +# +# The data sheet of the chip and technical reference manual can be found at https://docs.creatordev.io/ci40/guides/hardwaredocs/cXT200_datasheet2.pdf +# and https://docs.creatordev.io/ci40/guides/hardwaredocs/MIPS_Creator_cXT200_Tec…. +# +# The list of hardware devices is as per below: +# +# root@OpenWrt:/# arecord -l +# **** List of CAPTURE Hardware Devices **** card 0: pistachiocard [pistachio-card], device 1: pistachio-spdif-in snd-soc-dummy-dai-1 [] +# Subdevices: 1/1 +# Subdevice #0: subdevice #0 +# card 0: pistachiocard [pistachio-card], device 4: pistachio-i2s-in-0 snd-soc-dummy-dai-4 [] +# Subdevices: 1/1 +# Subdevice #0: subdevice #0 +# +# root@OpenWrt:/# aplay -l +# **** List of PLAYBACK Hardware Devices **** card 0: pistachiocard [pistachio-card], device 0: pistachio-spdif-out snd-soc-dummy-dai-0 [] +# Subdevices: 1/1 +# Subdevice #0: subdevice #0 +# card 0: pistachiocard [pistachio-card], device 2: pistachio-parallel-out pistachio_internal_dac-2 [] +# Subdevices: 1/1 +# Subdevice #0: subdevice #0 +# card 0: pistachiocard [pistachio-card], device 3: pistachio-i2s-out snd-soc-dummy-dai-3 [] +# Subdevices: 1/1 +# Subdevice #0: subdevice #0 +# + +pistachio-card.pcm.default{ + @args [ CARD ] + @args.CARD { + type string + default "pistachio" + } + @args.DEVICE { + type integer + default 2 + } + + type asym + capture.pcm { + type multi + slaves.a.pcm "hw:0,4" + slaves.a.channels 12 + bindings.0.slave a + bindings.0.channel 4 + bindings.1.slave a + bindings.1.channel 5 + } + + playback.pcm { + type hw + card $CARD + device $DEVICE + + } + +} -- 2.6.2

1 0

[alsa-devel] [PATCH 0/6] ALSA: firewire: simplify symbol space for local linkage
by Takashi Sakamoto 04 Jan '17

04 Jan '17

Hi, This patchset is just for code improvements, without adding features. Modules in ALSA firewire stack have some implementations for operation structures which sound subsystem defines. All of them are referred just by each local function to register corresponding operations. In this case, it's better to put them into the function local so that symbol space in local linkage of translation unit is kept to be simple. Takashi Sakamoto (6): ALSA: bebob: simplify symbol space for local linkage ALSA: fireworks: simplify symbol space for local linkage ALSA: oxfw: simplify symbol space for local linkage ALSA: dice: simplify symbol space for local linkage ALSA: firewire-digi00x: simplify symbol space for local linkage ALSA: firewire-tascam: simplify symbol space for local linkage sound/firewire/bebob/bebob_hwdep.c | 17 +++++----- sound/firewire/bebob/bebob_midi.c | 26 +++++++-------- sound/firewire/bebob/bebob_pcm.c | 51 ++++++++++++++--------------- sound/firewire/dice/dice-midi.c | 22 ++++++------- sound/firewire/digi00x/digi00x-hwdep.c | 17 +++++----- sound/firewire/digi00x/digi00x-midi.c | 52 ++++++++++++++---------------- sound/firewire/digi00x/digi00x-pcm.c | 52 ++++++++++++++---------------- sound/firewire/fireworks/fireworks_hwdep.c | 19 ++++++----- sound/firewire/fireworks/fireworks_midi.c | 26 +++++++-------- sound/firewire/fireworks/fireworks_pcm.c | 52 ++++++++++++++---------------- sound/firewire/oxfw/oxfw-midi.c | 26 +++++++-------- sound/firewire/tascam/tascam-hwdep.c | 17 +++++----- sound/firewire/tascam/tascam-midi.c | 26 +++++++-------- sound/firewire/tascam/tascam-pcm.c | 52 ++++++++++++++---------------- 14 files changed, 215 insertions(+), 240 deletions(-) -- 2.9.3

2 9

[alsa-devel] [PATCH v2 0/2] ALSA: Fix usb-audio races
by Ioan-Adrian Ratiu 04 Jan '17

04 Jan '17

Many thanks to Takashi Iwai & Sakamoto for their awesome feedback. Changes since v1: * Rebased my fix on top of tiwai's revert and integrated the changes from the original fix into this. * Dropped the stop_endpoints() call inside snd_usb_pcm_prepare() and kept the previously existing snd_usb_endpoint_sync_pending_stop() call. * Retained the deactivate_urbs() call in snd_usb_pcm_prepare(), I only removed the can_sleep logic. * Split the EP_FLAG_RUNNING check in a separate commit to keep the log clean since this is not part of the race fix. Ioan-Adrian Ratiu (2): ALSA: usb-audio: Fix irq/process data synchronization ALSA: usb-audio: test EP_FLAG_RUNNING at urb completion sound/usb/endpoint.c | 20 ++++++++++---------- sound/usb/endpoint.h | 2 +- sound/usb/pcm.c | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) -- 2.11.0

2 7

[alsa-devel] Add ALC299 support
by Kailang 04 Jan '17

04 Jan '17

Hi Takashi, We had new codec ALC299. It was similar as ALC225. Attach was the patch. BR, Kailang

2 1

[alsa-devel] [PATCH] ASoC: intel: rt5640: add support for sound card found on HP Pavilion x2 10-p000
by Alexandrov Stanislav 04 Jan '17

04 Jan '17

Add support for rt5640 sound card found on HP Pavilion x2 10-p000 tablet. Inside DSDT table there is record for this soundcard: Device (RTKC) { Name (_ADR, Zero) // _ADR: Address Name (_HID, "10EC3276") // _HID: Hardware ID Name (_CID, "10EC3276") // _CID: Compatible ID Name (_DDN, "ALC3276") // _DDN: DOS Device Name Name (_SUB, "103C827C") // _SUB: Subsystem ID Name (_PR0, Package (0x01) // _PR0: Power Resources for D0 original bugreport: https://bugzilla.kernel.org/show_bug.cgi?id=187621 --- diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index e29a6de..c5234b9 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2315,6 +2315,7 @@ static const struct acpi_device_id rt5640_acpi_match[] = { { "INT33CA", 0 }, { "10EC5640", 0 }, { "10EC5642", 0 }, + { "10EC3276", 0 }, { "INTCCFFD", 0 }, { }, }; diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index f4d92bb..896ced2 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -463,6 +463,8 @@ static struct sst_acpi_mach sst_acpi_chv[] = { /* some CHT-T platforms rely on RT5640, use Baytrail machine driver */ {"10EC5640", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", cht_quirk, &chv_platform_data }, + {"10EC3276", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", NULL, + &chv_platform_data }, {}, };

2 1

[alsa-devel] [PATCH] ASoC: intel: rt5640: add support for sound card found on HP Pavilion x2 10-p000
by Alexandrov Stanislav 03 Jan '17

03 Jan '17

Add support for rt5640 sound card found on HP Pavilion x2 10-p000 tablet. original bugreport: https://bugzilla.kernel.org/show_bug.cgi?id=187621 Signed-off-by: Alexandrov Stanislav <neko(a)nya.ai> --- sound/soc/codecs/rt5640.c | 1 + sound/soc/intel/atom/sst/sst_acpi.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index e29a6de..c5234b9 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2315,6 +2315,7 @@ static const struct acpi_device_id rt5640_acpi_match[] = { { "INT33CA", 0 }, { "10EC5640", 0 }, { "10EC5642", 0 }, + { "10EC3276", 0 }, { "INTCCFFD", 0 }, { }, }; diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index f4d92bb..896ced2 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -463,6 +463,8 @@ static struct sst_acpi_mach sst_acpi_chv[] = { /* some CHT-T platforms rely on RT5640, use Baytrail machine driver */ {"10EC5640", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", cht_quirk, &chv_platform_data }, + {"10EC3276", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", NULL, + &chv_platform_data }, {}, }; -- 2.10.2

1 0

[alsa-devel] [PATCH - seq 1/1] seq: improve documentation about new get pid/card functions
by Adam Goode 03 Jan '17

03 Jan '17

Document the technique for determining if the running kernel supports the new snd_seq_client_info_get_pid and snd_seq_client_info_get_card functions. Also add a little information about how to use these functions and add some cross references. Signed-off-by: Adam Goode <agoode(a)google.com> diff --git a/src/seq/seq.c b/src/seq/seq.c index 9279830..b206e2f 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c @@ -1530,7 +1530,25 @@ int snd_seq_client_info_get_error_bounce(const snd_seq_client_info_t *info) * \param info client_info container * \return card number or -1 if value is not available. * - * Only available for SND_SEQ_KERNEL_CLIENT clients. + * Only available for #SND_SEQ_KERNEL_CLIENT clients. + * + * The card number can be used to query state about the hardware + * device providing this client, by concatenating <code>"hw:CARD="</code> + * with the card number and using it as the <code>name</code> parameter + * to #snd_ctl_open(). + * + * \note + * The return value of -1 is returned for two different conditions: when the + * running kernel does not support this operation, and when the client + * does not have a hardware card attached. See + * #snd_seq_client_info_get_pid() for a way to determine if the + * currently running kernel has support for this operation. + * + * \sa snd_seq_client_info_get_pid(), + * snd_card_get_name(), + * snd_card_get_longname(), + * snd_ctl_open(), + * snd_ctl_card_info() */ int snd_seq_client_info_get_card(const snd_seq_client_info_t *info) { @@ -1543,7 +1561,29 @@ int snd_seq_client_info_get_card(const snd_seq_client_info_t *info) * \param info client_info container * \return pid or -1 if value is not available. * - * Only available for SND_SEQ_USER_CLIENT clients. + * Only available for #SND_SEQ_USER_CLIENT clients. + * + * \note + * The functionality for getting a client's PID and getting a + * client's card was added to the kernel at the same time, so you can + * use this function to determine if the running kernel + * supports reporting these values. If your own client has a valid + * PID as reported by this function, then the running kernel supports + * both #snd_seq_client_info_get_card() and #snd_seq_client_info_get_pid(). + * + * \note + * Example code for determining kernel support: + * \code + * int is_get_card_or_pid_supported(snd_seq_t *seq) + * { + * snd_seq_client_info_t *my_client_info; + * snd_seq_client_info_alloca(&my_client_info); + * snd_seq_get_client_info(seq, my_client_info); + * return snd_seq_client_info_get_pid(my_client_info) != -1; + * } + * \endcode + * + * \sa snd_seq_client_info_get_card() */ int snd_seq_client_info_get_pid(const snd_seq_client_info_t *info) { -- 2.8.0.rc3.226.g39d4020

2 1

[alsa-devel] [RFC PATCH] ucm: Add support for device positions
by mengdong.lin＠linux.intel.com 03 Jan '17

03 Jan '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Users can provide prosition info of audio devices as a device value. This will help the sound server to choose an audio devices from some candidates based on the their locations and the status of the machine. The value name is the "Postion", and its value should be a composition of "Top", "Bottom", "Left", "Right", "Front" and "Back". For example, a speaker may have a position like "Front Top". The postion value can be got by either of the two APIs: - snd_use_case_get(), via identifier 'Postion/device', to get the original position string defined by the user. - snd_use_case_geti(), via identifier '_devpos/device', to get the integer value of the position. If the user has not define a position, 0 will be returned that means an unknown position. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/include/use-case.h b/include/use-case.h index 8911645..b3b451b 100644 --- a/include/use-case.h +++ b/include/use-case.h @@ -165,6 +165,28 @@ extern "C" { #define SND_USE_CASE_TQ_VOICE "Voice" /**< Voice Tone Quality */ #define SND_USE_CASE_TQ_TONES "Tones" /**< Tones Tone Quality */ + +/** + * Device Position bits + * + * 0 is reserved for unknown position in each dimesion. Users can get the + * integer value of the device postion by API snd_use_case_geti() via + * identifier '_devpos/device', and the returned value is a compostion of + * three dimesions. + * + * NOTE: Users can also get the position string like "Top Left" by API + * snd_use_case_get() via identifier 'Position/device". + */ +#define SND_USE_CASE_POS_LEFT (1<<0) +#define SND_USE_CASE_POS_RIGHT (2<<0) +#define SND_USE_CASE_POS_HORIZON_MASK (0xffff<<0) +#define SND_USE_CASE_POS_TOP (1<<4) +#define SND_USE_CASE_POS_BOTTOM (2<<4) +#define SND_USE_CASE_POS_VERTICAL_MASK (0xffff<<4) +#define SND_USE_CASE_POS_FRONT (1<<8) +#define SND_USE_CASE_POS_BACK (2<<8) +#define SND_USE_CASE_DEPTH_MASK (0xffff<<8) + /** use case container */ typedef struct snd_use_case_mgr snd_use_case_mgr_t; @@ -319,6 +341,10 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr, * trick upper software layers to e.g. automatically mute speakers when * headphones are plugged in, but that's application policy * configuration that doesn't belong to UCM configuration files. + * - Position + * Position of the device, a composition of "Left", "Right", "Top", + * "Bottom", "Front" and "Back". For example, a device speaker may + * have a position like "Front Top". */ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr, const char *identifier, diff --git a/src/ucm/main.c b/src/ucm/main.c index 2d33886..d196a57 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -801,6 +801,26 @@ long device_status(snd_use_case_mgr_t *uc_mgr, return 0; } +/* get the device postion */ +long device_position(snd_use_case_mgr_t *uc_mgr, const char *device_name) +{ + struct use_case_device *dev; + struct list_head *pos, *base; + + if (uc_mgr->active_verb == NULL) + return -EINVAL; + + base = &uc_mgr->active_verb->device_list; + list_for_each(pos, base) { + dev = list_entry(pos, struct use_case_device, list); + if (strcmp(dev->name, device_name) == 0) + return dev->position; + } + + /* cannot find the device */ + return -1; +} + long modifier_status(snd_use_case_mgr_t *uc_mgr, const char *modifier_name) { @@ -1645,6 +1665,19 @@ int snd_use_case_geti(snd_use_case_mgr_t *uc_mgr, } else if (identifier[0] == '_') err = -ENOENT; #endif + } else if (check_identifier(identifier, "_devpos")) { + if (!str) { + err = -EINVAL; + goto __end; + } + + err = device_position(uc_mgr, str); + if (err >= 0) { + *value = err; + err = 0; + } else { + err = -EINVAL; + } } else err = -ENOENT; if (str) diff --git a/src/ucm/parser.c b/src/ucm/parser.c index 4dc35c3..fc035c3 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -55,6 +55,22 @@ static const char * const component_dir[] = { NULL, /* terminator */ }; +struct position { + int val; + const char *id; +}; + +/* device positions */ +static struct position positions[] = { + { SND_USE_CASE_POS_LEFT, "Left" }, + { SND_USE_CASE_POS_RIGHT, "Right" }, + { SND_USE_CASE_POS_TOP, "Top" }, + { SND_USE_CASE_POS_BOTTOM, "Bottom" }, + { SND_USE_CASE_POS_FRONT, "Front" }, + { SND_USE_CASE_POS_BACK, "Back" }, + { 0, NULL }, /* terminator */ +}; + static int filename_filter(const struct dirent *dirent); static int is_component_directory(const char *dir); @@ -62,6 +78,30 @@ static int parse_sequence(snd_use_case_mgr_t *uc_mgr, struct list_head *base, snd_config_t *cfg); +static unsigned int parse_position(struct list_head *value_list) +{ + struct list_head *pos; + struct ucm_value *val; + int i, position = 0; + + list_for_each(pos, value_list) { + val = list_entry(pos, struct ucm_value, list); + if (strncmp("Position", val->name, MAX_IDENTIFIER) == 0) { + i = 0; + while (positions[i].id) { + if (strstr(val->data, positions[i].id)) + position |= positions[i].val; + i++; + } + + return position; + } + } + + /* unknown position */ + return 0; +} + /* * Parse string */ @@ -870,6 +910,7 @@ static int parse_device(snd_use_case_mgr_t *uc_mgr, uc_error("error: failed to parse Value"); return err; } + device->position = parse_position(&device->value_list); continue; } } diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index 299a5b9..2537a1d 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -42,6 +42,7 @@ #define MAX_FILE 256 #define MAX_CARD_LONG_NAME 80 +#define MAX_IDENTIFIER 32 /* Max length of identifier string */ #define ALSA_USE_CASE_DIR ALSA_CONFIG_DIR "/ucm" #define SEQUENCE_ELEMENT_TYPE_CDEV 1 @@ -139,6 +140,7 @@ struct use_case_device { char *name; char *comment; + int position; /* bits of SND_USE_CASE_POS_, 0 for unknown position */ /* device enable and disable sequences */ struct list_head enable_list; -- 2.7.4

6 6