Commit 5f72307d authored by Peter Maydell's avatar Peter Maydell
Browse files

linux-user: Fix SNDCTL_DSP_MAP{IN, OUT}BUF ioctl definitions 



Fix the SNDCTL_DSP_MAP{IN,OUT}BUF ioctl definitions so that they
refer to a suitably defined target struct layout rather than hardcoding
the ioctl number. This fixes complaints from the syscall_init()
consistency check when running an x86_64-to-x86_64 linux-user qemu.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent c8b0bf54

linux-user/ioctls.h

+2 −2
Original line number Diff line number Diff line
@@ -186,8 +186,8 @@ 
  IOCTL(SNDCTL_DSP_GETISPACE, IOC_R, MK_PTR(MK_STRUCT(STRUCT_audio_buf_info)))

  IOCTL(SNDCTL_DSP_GETOSPACE, IOC_R, MK_PTR(MK_STRUCT(STRUCT_audio_buf_info)))

  IOCTL(SNDCTL_DSP_GETTRIGGER, IOC_R, MK_PTR(TYPE_INT))

  IOCTL(SNDCTL_DSP_MAPINBUF, IOC_R, MK_PTR(TYPE_INT))

  IOCTL(SNDCTL_DSP_MAPOUTBUF, IOC_R, MK_PTR(TYPE_INT))

  IOCTL(SNDCTL_DSP_MAPINBUF, IOC_R, MK_PTR(MK_STRUCT(STRUCT_buffmem_desc)))

  IOCTL(SNDCTL_DSP_MAPOUTBUF, IOC_R, MK_PTR(MK_STRUCT(STRUCT_buffmem_desc)))

  IOCTL(SNDCTL_DSP_NONBLOCK, 0, TYPE_NULL)

  IOCTL(SNDCTL_DSP_POST, 0, TYPE_NULL)

  IOCTL(SNDCTL_DSP_RESET, 0, TYPE_NULL)

linux-user/syscall_defs.h

+2 −2
Original line number Diff line number Diff line
@@ -2226,8 +2226,8 @@ struct target_eabi_flock64 { 
#define TARGET_SNDCTL_DSP_GETTRIGGER      TARGET_IOR('P',16, int)

#define TARGET_SNDCTL_DSP_GETIPTR         TARGET_IORU('P',17)

#define TARGET_SNDCTL_DSP_GETOPTR         TARGET_IORU('P',18)

#define TARGET_SNDCTL_DSP_MAPINBUF        0x80085013

#define TARGET_SNDCTL_DSP_MAPOUTBUF       0x80085014

#define TARGET_SNDCTL_DSP_MAPINBUF        TARGET_IORU('P', 19)

#define TARGET_SNDCTL_DSP_MAPOUTBUF       TARGET_IORU('P', 20)

#define TARGET_SNDCTL_DSP_NONBLOCK        0x0000500e

#define TARGET_SNDCTL_DSP_SAMPLESIZE      0xc0045005

#define TARGET_SNDCTL_DSP_SETDUPLEX       0x00005016

linux-user/syscall_types.h

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ STRUCT(audio_buf_info, 
STRUCT(count_info,

       TYPE_INT, TYPE_INT, TYPE_INT)



STRUCT(buffmem_desc,

       TYPE_PTRVOID, TYPE_INT)



STRUCT(mixer_info,

       MK_ARRAY(TYPE_CHAR, 16), MK_ARRAY(TYPE_CHAR, 32), TYPE_INT, MK_ARRAY(TYPE_INT, 10))