From mattw@uryfs1.york.ac.uk  Sun Apr 25 14:57:05 2004
Return-Path: <mattw@uryfs1.york.ac.uk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 20C7316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Apr 2004 14:57:05 -0700 (PDT)
Received: from mail-gw0.york.ac.uk (mail-gw0.york.ac.uk [144.32.128.245])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4CF1843D46
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Apr 2004 14:57:02 -0700 (PDT)
	(envelope-from mattw@uryfs1.york.ac.uk)
Received: from uryfs1.york.ac.uk (uryfs1.york.ac.uk [144.32.109.6])
	by mail-gw0.york.ac.uk (8.12.10/8.12.10) with ESMTP id i3PLuvUp005619
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Apr 2004 22:56:57 +0100 (BST)
Received: from uryfs1.york.ac.uk (localhost [127.0.0.1])
	by uryfs1.york.ac.uk (8.12.10/8.12.10) with ESMTP id i3PLuq5x019149
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Apr 2004 22:56:52 +0100 (BST)
	(envelope-from mattw@uryfs1.york.ac.uk)
Received: (from mattw@localhost)
	by uryfs1.york.ac.uk (8.12.10/8.12.10/Submit) id i3PLuqdW019148;
	Sun, 25 Apr 2004 22:56:52 +0100 (BST)
	(envelope-from mattw)
Message-Id: <200404252156.i3PLuqdW019148@uryfs1.york.ac.uk>
Date: Sun, 25 Apr 2004 22:56:52 +0100 (BST)
From: Matt Wright <mattw@ury.york.ac.uk>
Reply-To: Matt Wright <mattw@ury.york.ac.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: LINUX_SOUND_MIXER_INFO Ioctl addition for Helix Producer under Linux compat
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65971
>Category:       kern
>Synopsis:       LINUX_SOUND_MIXER_INFO Ioctl addition for Helix Producer under Linux compat
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bms
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 25 15:00:43 PDT 2004
>Closed-Date:    Sat Apr 09 06:29:35 GMT 2005
>Last-Modified:  Sat Apr 09 06:29:35 GMT 2005
>Originator:     Matt Wright
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
University Radio York 
>Environment:
System: FreeBSD uryfs1.york.ac.uk 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #1: Mon Apr 19 17:29:24 BST 2004 root@uryfs1.york.ac.uk:/music/obj/music/src/sys/URYFS1KERNEL i386


	
>Description:
Using Helix Producer (Linux 2.2 glibc) under 5.2-RELEASE+ causes ioctl not implemented message ('M', 101). Attached patch adds Ioctl to Linux compat module to pass through to FreeBSD sound ioctls.
"Fri 23 01:15:19 uryfs1 /kernel: linux: 'ioctl' fd=4, cmd=0x4d65 ('M',101) not implemented"
	
>How-To-Repeat:
Download helixproducer 10 from www.helixcommunity.org, attempt to stream to helix server reading audio from /dev/audio.
	
>Fix:

	

--- streamer.patch begins here ---
diff -Naur sys/compat/linux/linux_ioctl.c sys-fixed/compat/linux/linux_ioctl.c
--- sys/compat/linux/linux_ioctl.c	Fri Oct 31 18:31:55 2003
+++ sys-fixed/compat/linux/linux_ioctl.c	Sun Apr 25 03:31:25 2004
@@ -1581,6 +1581,10 @@
 		args->cmd = SETDIR(SOUND_MIXER_WRITE_LINE3);
 		return (ioctl(td, (struct ioctl_args *)args));
 
+	case LINUX_SOUND_MIXER_INFO:
+		args->cmd = SETDIR(SOUND_MIXER_INFO);
+		return (ioctl(td, (struct ioctl_args *)args));
+
 	case LINUX_OSS_GETVERSION: {
 		int version = linux_get_oss_version(td);
 		return (copyout(&version, (void *)args->arg, sizeof(int)));
diff -Naur sys/compat/linux/linux_ioctl.h sys-fixed/compat/linux/linux_ioctl.h
--- sys/compat/linux/linux_ioctl.h	Thu Apr 24 23:36:35 2003
+++ sys-fixed/compat/linux/linux_ioctl.h	Sun Apr 25 03:31:51 2004
@@ -217,6 +217,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_INFO		0x4d65
 #define	LINUX_OSS_GETVERSION		0x4d76
 #define	LINUX_SOUND_MIXER_READ_STEREODEVS	0x4dfb
 #define	LINUX_SOUND_MIXER_READ_DEVMASK	0x4dfe
--- streamer.patch ends here ---


>Release-Note:
>Audit-Trail:

From: Bruce M Simpson <bms@spc.org>
To: Matt Wright <mattw@ury.york.ac.uk>
Cc: Gavin Atkinson <gavin@ury.york.ac.uk>,
	freebsd-gnats-submit@FreeBSD.org
Subject: Re: kern/65971: LINUX_SOUND_MIXER_INFO Ioctl addition for Helix Producer under Linux compat
Date: Fri, 18 Jun 2004 13:02:03 +0100

 This looks like a duplicate of misc/27471.
 
 Does your patch fix the problem for you? It looks like it can be applied
 to the mainline without any unwanted side-effects.
 
 Regards,
 BMS
Responsible-Changed-From-To: freebsd-bugs->bms 
Responsible-Changed-By: bms 
Responsible-Changed-When: Fri Jun 18 12:11:51 GMT 2004 
Responsible-Changed-Why:  
I'll field this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65971 

From: Matt Wright <mattw@ury.york.ac.uk>
To: Bruce M Simpson <bms@spc.org>
Cc: Gavin Atkinson <gavin@ury.york.ac.uk>,
	freebsd-gnats-submit@FreeBSD.org
Subject: Re: kern/65971: LINUX_SOUND_MIXER_INFO Ioctl addition for Helix
 Producer under Linux compat
Date: Fri, 18 Jun 2004 13:27:36 +0100 (BST)

 Hi,
 
 Yes it works fine with this patch. We've been using real on fbsd for weeks
 now with no problems.
 
 Regards,
 
 Matt
 
 ---------------------------
 Matt Wright
 Acting Head of Computing
 (( URY ))
 ---------------------------
 
 On Fri, 18 Jun 2004, Bruce M Simpson wrote:
 
 > This looks like a duplicate of misc/27471.
 >
 > Does your patch fix the problem for you? It looks like it can be applied
 > to the mainline without any unwanted side-effects.
 >
 > Regards,
 > BMS
 >
State-Changed-From-To: open->patched 
State-Changed-By: bms 
State-Changed-When: Fri Jun 18 14:25:54 GMT 2004 
State-Changed-Why:  
Committed to HEAD as-is, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65971 

From: Matteo Riondato <rionda@gufi.org>
To: bug-followup@freebsd.org
Cc: bms@freebsd.org
Subject: Re: kern/65971 LINUX_SOUND_MIXER_INFO Ioctl addition for Helix Producer under Linux compat
Date: Fri, 8 Apr 2005 20:44:56 +0200

 --v9g2r9e2kvGs7M7R
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 This was MFCed to RELENG_5 but not to RELENG_4.
 If and after the merge happened, the PR can be closed.
 Best Regards
 --=20
 Rionda aka Matteo Riondato
 Disinformato per default
 G.U.F.I. Staff Member (http://www.gufi.org)
 FreeSBIE Developer (http://www.freesbie.org)
 
 --v9g2r9e2kvGs7M7R
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (FreeBSD)
 
 iD8DBQFCVtEn2Mp4pR7Fa+wRAiP0AKCpnhZVC6R7ur5iSSrOokDUA95hrgCgiHMh
 0+uH7WJ+UH1V7CVKT7yVoJU=
 =33Mx
 -----END PGP SIGNATURE-----
 
 --v9g2r9e2kvGs7M7R--
State-Changed-From-To: patched->closed 
State-Changed-By: bms 
State-Changed-When: Sat Apr 9 06:29:23 GMT 2005 
State-Changed-Why:  
5.x is now RELEASE 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65971 
>Unformatted:
