Author: mav
Date: Sat Sep 27 08:35:23 2014
New Revision: 272205
URL: http://svnweb.freebsd.org/changeset/base/272205
Log:
MFC r272059:
Remake Linux' SOUND_MIXER_INFO IOCTL as a wrapper around new FreeBSD's one.
Submitted by: Dmitry Luhtionov <dmitryluhtio...@gmail.com>
Modified:
stable/9/sys/compat/linux/linux_ioctl.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/sys/compat/linux/linux_ioctl.c
==============================================================================
--- stable/9/sys/compat/linux/linux_ioctl.c Sat Sep 27 08:33:50 2014
(r272204)
+++ stable/9/sys/compat/linux/linux_ioctl.c Sat Sep 27 08:35:23 2014
(r272205)
@@ -1665,13 +1665,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];
@@ -1759,12 +1752,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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
