2007-12-16 00:36:26

by Miguel Botón

Subject: [PATCH] alsa: fix SNDRV_PCM_IOCTL_TTSTAMP value.

"[ALSA] Use posix clock monotonic for PCM and timer timestamps" introduces
a bug that makes audio device unusable in some computers.

Signed-off-by: Miguel Botón <[email protected]>

diff --git a/include/sound/asound.h b/include/sound/asound.h
index 475eb71..d35aa44 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -443,7 +443,7 @@ enum {
enum {
SNDRV_PCM_IOCTL_PVERSION = _IOR('A', 0x00, int),
SNDRV_PCM_IOCTL_INFO = _IOR('A', 0x01, struct snd_pcm_info),
- SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x03, int),
+ SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x02, int),
SNDRV_PCM_IOCTL_HW_REFINE = _IOWR('A', 0x10, struct snd_pcm_hw_params),
SNDRV_PCM_IOCTL_HW_PARAMS = _IOWR('A', 0x11, struct snd_pcm_hw_params),
SNDRV_PCM_IOCTL_HW_FREE = _IO('A', 0x12),

--
Miguel Botón

2007-12-17 08:08:00

by Jaroslav Kysela

Subject: Re: [PATCH] alsa: fix SNDRV_PCM_IOCTL_TTSTAMP value.

On Sun, 16 Dec 2007, Miguel Bot?n wrote:

> "[ALSA] Use posix clock monotonic for PCM and timer timestamps" introduces
> a bug that makes audio device unusable in some computers.
>
> Signed-off-by: Miguel Bot?n <[email protected]>

Thanks for notify that old alsa-lib binaries have trouble with this patch.
But your fix is wrong. New and old ioctls are incompatible. I added old
ioctl back to our HG tree.

Jaroslav

> diff --git a/include/sound/asound.h b/include/sound/asound.h
> index 475eb71..d35aa44 100644
> --- a/include/sound/asound.h
> +++ b/include/sound/asound.h
> @@ -443,7 +443,7 @@ enum {
> enum {
> SNDRV_PCM_IOCTL_PVERSION = _IOR('A', 0x00, int),
> SNDRV_PCM_IOCTL_INFO = _IOR('A', 0x01, struct snd_pcm_info),
> - SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x03, int),
> + SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x02, int),
> SNDRV_PCM_IOCTL_HW_REFINE = _IOWR('A', 0x10, struct snd_pcm_hw_params),
> SNDRV_PCM_IOCTL_HW_PARAMS = _IOWR('A', 0x11, struct snd_pcm_hw_params),
> SNDRV_PCM_IOCTL_HW_FREE = _IO('A', 0x12),
>
> --
> Miguel Bot?n
>

-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project