Date: Thu, 17 Sep 2020 11:44:45 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365833 - head/sys/compat/linux Message-ID: <202009171144.08HBijrE057523@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Thu Sep 17 11:44:45 2020 New Revision: 365833 URL: https://svnweb.freebsd.org/changeset/base/365833 Log: Add support for SOUND_MIXER_WRITE_MONITOR ioctl. Fixes alsamixer(1) on my x220. Reviewed by: emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25806 Modified: head/sys/compat/linux/linux_ioctl.c head/sys/compat/linux/linux_ioctl.h Modified: head/sys/compat/linux/linux_ioctl.c ============================================================================== --- head/sys/compat/linux/linux_ioctl.c Thu Sep 17 11:39:33 2020 (r365832) +++ head/sys/compat/linux/linux_ioctl.c Thu Sep 17 11:44:45 2020 (r365833) @@ -1794,6 +1794,10 @@ linux_ioctl_sound(struct thread *td, struct linux_ioct args->cmd = SETDIR(SOUND_MIXER_WRITE_LINE3); return (sys_ioctl(td, (struct ioctl_args *)args)); + case LINUX_SOUND_MIXER_WRITE_MONITOR: + args->cmd = SETDIR(SOUND_MIXER_WRITE_MONITOR); + return (sys_ioctl(td, (struct ioctl_args *)args)); + case LINUX_SOUND_MIXER_INFO: { /* Key on encoded length */ switch ((args->cmd >> 16) & 0x1fff) { Modified: head/sys/compat/linux/linux_ioctl.h ============================================================================== --- head/sys/compat/linux/linux_ioctl.h Thu Sep 17 11:39:33 2020 (r365832) +++ head/sys/compat/linux/linux_ioctl.h Thu Sep 17 11:44:45 2020 (r365833) @@ -278,6 +278,7 @@ #define LINUX_SOUND_MIXER_WRITE_LINE1 0x4d0E #define LINUX_SOUND_MIXER_WRITE_LINE2 0x4d0F #define LINUX_SOUND_MIXER_WRITE_LINE3 0x4d10 +#define LINUX_SOUND_MIXER_WRITE_MONITOR 0x4d18 #define LINUX_SOUND_MIXER_INFO 0x4d65 #define LINUX_OSS_GETVERSION 0x4d76 #define LINUX_SOUND_MIXER_READ_STEREODEVS 0x4dfb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009171144.08HBijrE057523>