37a7c30e09
- Backport upstream fixes: surround41/50 chmap fix, UCM documents, config string fix, PCM timestamp query API, replacement of list.h with LGPL: 0023-surround41-50.conf-Use-chmap-syntax-for-better-flexi.patch 0024-ucm-docs-fix-doxygen-exclude-patch-for-UCM-local-hea.patch 0025-ucm-docs-Fix-doxygen-formatting-for-UCM-main-page.patch 0026-docs-Add-UCM-link-to-main-doxygen-page.patch 0027-Replace-unsafe-characters-with-_-in-card-name.patch 0028-pcm-add-helper-functions-to-query-timestamping-capab.patch 0029-pcm-add-support-for-get-set_audio_htstamp_config.patch 0030-pcm-add-support-for-new-STATUS_EXT-ioctl.patch 0031-test-fix-audio_time-with-new-get-set-audio_tstamp_co.patch 0032-test-audio_time-show-report-validity-and-accuracy.patch 0033-pcm-restore-hw-params-on-set-latency-failed.patch 0034-Replace-list.h-with-its-own-version.patch - Backport topology API addition patches: 0035-topology-uapi-Add-UAPI-headers-for-topology-ABI.patch 0036-topology-Add-topology-core-parser.patch 0037-topology-Add-text-section-parser.patch 0038-topology-Add-PCM-parser.patch 0039-topology-Add-operations-parser.patch 0040-topology-Add-private-data-parser.patch 0041-topology-Add-DAPM-object-parser.patch 0042-topology-Add-CTL-parser.patch 0043-topology-Add-Channel-map-parser.patch 0044-topology-Add-binary-file-builder.patch 0045-topology-autotools-Add-build-support-for-topology-co.patch 0046-topology-doxygen-Add-doxygen-support-for-topology-co.patch 0047-conf-topology-Add-topology-file-for-broadwell-audio-.patch 0048-topology-Fix-missing-inclusion-of-ctype.h.patch OBS-URL: https://build.opensuse.org/request/show/320429 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=186
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From cc8b73436a90c35beda64bfa13b2196df20cfd81 Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Date: Wed, 1 Jul 2015 15:40:56 -0500
|
|
Subject: [PATCH 30/49] pcm: add support for new STATUS_EXT ioctl
|
|
|
|
use STATUS_EXT ioctl if PCM protocol is > 2.0.12
|
|
All audio timestamp configuration will be ignored with an
|
|
older protocol.
|
|
|
|
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_hw.c | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
|
|
index c34b766ee035..232b19736db9 100644
|
|
--- a/src/pcm/pcm_hw.c
|
|
+++ b/src/pcm/pcm_hw.c
|
|
@@ -510,10 +510,18 @@ static int snd_pcm_hw_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
|
|
{
|
|
snd_pcm_hw_t *hw = pcm->private_data;
|
|
int fd = hw->fd, err;
|
|
- if (ioctl(fd, SNDRV_PCM_IOCTL_STATUS, status) < 0) {
|
|
- err = -errno;
|
|
- SYSMSG("SNDRV_PCM_IOCTL_STATUS failed (%i)", err);
|
|
- return err;
|
|
+ if (SNDRV_PROTOCOL_VERSION(2, 0, 13) > hw->version) {
|
|
+ if (ioctl(fd, SNDRV_PCM_IOCTL_STATUS, status) < 0) {
|
|
+ err = -errno;
|
|
+ SYSMSG("SNDRV_PCM_IOCTL_STATUS failed (%i)", err);
|
|
+ return err;
|
|
+ }
|
|
+ } else {
|
|
+ if (ioctl(fd, SNDRV_PCM_IOCTL_STATUS_EXT, status) < 0) {
|
|
+ err = -errno;
|
|
+ SYSMSG("SNDRV_PCM_IOCTL_STATUS_EXT failed (%i)", err);
|
|
+ return err;
|
|
+ }
|
|
}
|
|
if (SNDRV_PROTOCOL_VERSION(2, 0, 5) > hw->version) {
|
|
status->tstamp.tv_nsec *= 1000L;
|
|
--
|
|
2.5.0
|
|
|