|
From: <sv...@va...> - 2005-11-14 17:04:00
|
Author: tom
Date: 2005-11-14 17:03:54 +0000 (Mon, 14 Nov 2005)
New Revision: 5131
Log:
Handle some ALSA ioctls that don't have size or direction hints.
Modified:
trunk/coregrind/m_syswrap/syswrap-generic.c
trunk/include/vki-linux.h
Modified: trunk/coregrind/m_syswrap/syswrap-generic.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syswrap/syswrap-generic.c 2005-11-14 17:01:01 UTC (=
rev 5130)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2005-11-14 17:03:54 UTC (=
rev 5131)
@@ -3472,6 +3472,23 @@
case VKI_SNDCTL_DSP_SETDUPLEX:
break;
=20
+ /* linux/soundcard interface (ALSA) */
+ case VKI_SNDRV_PCM_IOCTL_HW_FREE:
+ case VKI_SNDRV_PCM_IOCTL_HWSYNC:
+ case VKI_SNDRV_PCM_IOCTL_PREPARE:
+ case VKI_SNDRV_PCM_IOCTL_RESET:
+ case VKI_SNDRV_PCM_IOCTL_START:
+ case VKI_SNDRV_PCM_IOCTL_DROP:
+ case VKI_SNDRV_PCM_IOCTL_DRAIN:
+ case VKI_SNDRV_PCM_IOCTL_RESUME:
+ case VKI_SNDRV_PCM_IOCTL_XRUN:
+ case VKI_SNDRV_PCM_IOCTL_UNLINK:
+ case VKI_SNDRV_TIMER_IOCTL_START:
+ case VKI_SNDRV_TIMER_IOCTL_STOP:
+ case VKI_SNDRV_TIMER_IOCTL_CONTINUE:
+ case VKI_SNDRV_TIMER_IOCTL_PAUSE:
+ break;
+
/* Real Time Clock (/dev/rtc) ioctls */
case VKI_RTC_UIE_ON:
case VKI_RTC_UIE_OFF:
@@ -4154,6 +4171,23 @@
case VKI_SNDCTL_DSP_SETDUPLEX:
break;
=20
+ /* linux/soundcard interface (ALSA) */
+ case VKI_SNDRV_PCM_IOCTL_HW_FREE:
+ case VKI_SNDRV_PCM_IOCTL_HWSYNC:
+ case VKI_SNDRV_PCM_IOCTL_PREPARE:
+ case VKI_SNDRV_PCM_IOCTL_RESET:
+ case VKI_SNDRV_PCM_IOCTL_START:
+ case VKI_SNDRV_PCM_IOCTL_DROP:
+ case VKI_SNDRV_PCM_IOCTL_DRAIN:
+ case VKI_SNDRV_PCM_IOCTL_RESUME:
+ case VKI_SNDRV_PCM_IOCTL_XRUN:
+ case VKI_SNDRV_PCM_IOCTL_UNLINK:
+ case VKI_SNDRV_TIMER_IOCTL_START:
+ case VKI_SNDRV_TIMER_IOCTL_STOP:
+ case VKI_SNDRV_TIMER_IOCTL_CONTINUE:
+ case VKI_SNDRV_TIMER_IOCTL_PAUSE:
+ break;
+
/* Real Time Clock (/dev/rtc) ioctls */
case VKI_RTC_UIE_ON:
case VKI_RTC_UIE_OFF:
Modified: trunk/include/vki-linux.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/include/vki-linux.h 2005-11-14 17:01:01 UTC (rev 5130)
+++ trunk/include/vki-linux.h 2005-11-14 17:03:54 UTC (rev 5131)
@@ -2066,6 +2066,30 @@
=20
#define VKI_PTRACE_DETACH 0x11
=20
+//----------------------------------------------------------------------
+// From linux-2.6.14/include/sound/asound.h
+//----------------------------------------------------------------------
+
+enum {
+ VKI_SNDRV_PCM_IOCTL_HW_FREE =3D _VKI_IO('A', 0x12),
+ VKI_SNDRV_PCM_IOCTL_HWSYNC =3D _VKI_IO('A', 0x22),
+ VKI_SNDRV_PCM_IOCTL_PREPARE =3D _VKI_IO('A', 0x40),
+ VKI_SNDRV_PCM_IOCTL_RESET =3D _VKI_IO('A', 0x41),
+ VKI_SNDRV_PCM_IOCTL_START =3D _VKI_IO('A', 0x42),
+ VKI_SNDRV_PCM_IOCTL_DROP =3D _VKI_IO('A', 0x43),
+ VKI_SNDRV_PCM_IOCTL_DRAIN =3D _VKI_IO('A', 0x44),
+ VKI_SNDRV_PCM_IOCTL_RESUME =3D _VKI_IO('A', 0x47),
+ VKI_SNDRV_PCM_IOCTL_XRUN =3D _VKI_IO('A', 0x48),
+ VKI_SNDRV_PCM_IOCTL_UNLINK =3D _VKI_IO('A', 0x61),
+};
+
+enum {
+ VKI_SNDRV_TIMER_IOCTL_START =3D _VKI_IO('T', 0xa0),
+ VKI_SNDRV_TIMER_IOCTL_STOP =3D _VKI_IO('T', 0xa1),
+ VKI_SNDRV_TIMER_IOCTL_CONTINUE =3D _VKI_IO('T', 0xa2),
+ VKI_SNDRV_TIMER_IOCTL_PAUSE =3D _VKI_IO('T', 0xa3),
+};
+
#endif // __VKI_LINUX_H
=20
/*--------------------------------------------------------------------*/
|