svn commit: r272059 - head/sys/compat/linux
Alexander Motin
mav at FreeBSD.org
Wed Sep 24 08:18:12 UTC 2014
Author: mav
Date: Wed Sep 24 08:18:11 2014
New Revision: 272059
URL: http://svnweb.freebsd.org/changeset/base/272059
Log:
Remake Linux' SOUND_MIXER_INFO IOCTL as a wrapper around new FreeBSD's one.
Submitted by: Dmitry Luhtionov <dmitryluhtionov at gmail.com>
MFC after: 3 days
Modified:
head/sys/compat/linux/linux_ioctl.c
Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c Wed Sep 24 07:29:07 2014 (r272058)
+++ head/sys/compat/linux/linux_ioctl.c Wed Sep 24 08:18:11 2014 (r272059)
@@ -1699,13 +1699,6 @@ linux_ioctl_vfat(struct thread *td, stru
* Sound related ioctls
*/
-struct linux_mixer_info {
- char id[16];
- char name[32];
- int modify_counter;
- int fillers[10];
-};
-
struct linux_old_mixer_info {
char id[16];
char name[32];
@@ -1793,12 +1786,8 @@ linux_ioctl_sound(struct thread *td, str
/* Key on encoded length */
switch ((args->cmd >> 16) & 0x1fff) {
case 0x005c: { /* SOUND_MIXER_INFO */
- struct linux_mixer_info info;
- bzero(&info, sizeof(info));
- strncpy(info.id, "OSS", sizeof(info.id) - 1);
- strncpy(info.name, "FreeBSD OSS Mixer", sizeof(info.name) - 1);
- copyout(&info, (void *)args->arg, sizeof(info));
- return (0);
+ args->cmd = SOUND_MIXER_INFO;
+ return (sys_ioctl(td, (struct ioctl_args *)args));
}
case 0x0030: { /* SOUND_OLD_MIXER_INFO */
struct linux_old_mixer_info info;
More information about the svn-src-all
mailing list