diff options
| author | mav <mav@FreeBSD.org> | 2014-09-27 08:33:50 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2014-09-27 08:33:50 +0000 |
| commit | e094f2b40732660b2ab5e940466cc8a64cbd67d9 (patch) | |
| tree | f19a91f58bd78c4eed10efa98ea73711494e1db7 /sys/compat | |
| parent | 5df569ca0ad48d57e9e0b747bf73a5361e7cb236 (diff) | |
| download | FreeBSD-src-e094f2b40732660b2ab5e940466cc8a64cbd67d9.zip FreeBSD-src-e094f2b40732660b2ab5e940466cc8a64cbd67d9.tar.gz | |
MFC r272059:
Remake Linux' SOUND_MIXER_INFO IOCTL as a wrapper around new FreeBSD's one.
Submitted by: Dmitry Luhtionov <dmitryluhtionov@gmail.com>
Approved by: re (kib)
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 052dd19..43532c6 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -1698,13 +1698,6 @@ linux_ioctl_vfat(struct thread *td, struct linux_ioctl_args *args) * 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]; @@ -1792,12 +1785,8 @@ linux_ioctl_sound(struct thread *td, struct linux_ioctl_args *args) /* 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; |
