From owner-p4-projects@FreeBSD.ORG  Tue Jun 27 06:44:00 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3198C16A403; Tue, 27 Jun 2006 06:44:00 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0DADE16A401
	for <perforce@FreeBSD.org>; Tue, 27 Jun 2006 06:44:00 +0000 (UTC)
	(envelope-from ryanb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A083043D48
	for <perforce@FreeBSD.org>; Tue, 27 Jun 2006 06:43:59 +0000 (GMT)
	(envelope-from ryanb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R6hxRH092988
	for <perforce@FreeBSD.org>; Tue, 27 Jun 2006 06:43:59 GMT
	(envelope-from ryanb@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R6hxxU092985
	for perforce@freebsd.org; Tue, 27 Jun 2006 06:43:59 GMT
	(envelope-from ryanb@FreeBSD.org)
Date: Tue, 27 Jun 2006 06:43:59 GMT
Message-Id: <200606270643.k5R6hxxU092985@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ryanb@FreeBSD.org using -f
From: Ryan Beasley <ryanb@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 100119 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 06:44:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=100119

Change 100119 by ryanb@ryanb_yuki on 2006/06/27 06:43:43

	Install stub ioctls for 
	  SNDCTL_DSP_GET_PLAYTGT_NAMES
	  SNDCTL_DSP_GET_PLAYTGT
	  SNDCTL_DSP_SET_PLAYTGT

Affected files ...

.. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#7 edit

Differences ...

==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#7 (text+ko) ====

@@ -408,6 +408,7 @@
 	int kill;
     	int ret = 0, *arg_i = (int *)arg, tmp;
 #ifdef OSSV4_EXPERIMENT
+	oss_mixer_enuminfo *ei;
 	int xcmd;
 
 	xcmd = 0;
@@ -1082,6 +1083,42 @@
 			/** @todo verify error correctness */
 			ret = EINVAL;
 		break;
+
+	/*
+	 * The following 3 ioctls aren't very useful at the moment.  For
+	 * now, only a single channel is associated with a cdev (/dev/dspN
+	 * instance), so there's only a single output routing to use (i.e.,
+	 * the wrch bound to this cdev).
+	 */
+	case SNDCTL_DSP_GET_PLAYTGT_NAMES:
+		ei = (oss_mixer_enuminfo *)arg;
+		ei->dev = 0;
+		ei->ctrl = 0;
+		ei->version = 0; /* static for now */
+		ei->strindex[0] = 0;
+
+		if (wrch != NULL) {
+			ei->nvalues = 1;
+			strlcpy(ei->strings, wrch->name, sizeof(ei->strings));
+		} else {
+			ei->nvalues = 0;
+			ei->strings[0] = '\0';
+		}
+		break;
+	case SNDCTL_DSP_GET_PLAYTGT:
+	case SNDCTL_DSP_SET_PLAYTGT:	/* yes, they are the same for now */
+		/*
+		 * Re: SET_PLAYTGT
+		 *   OSSv4: "The value that was accepted by the device will
+		 *   be returned back in the variable pointed by the
+		 *   argument."
+		 */
+		if (wrch != NULL)
+			*arg_i = 0;
+		else
+			ret = EINVAL;
+		break;
+
 #endif	/* !OSSV4_EXPERIMENT */
     	case SNDCTL_DSP_MAPINBUF:
     	case SNDCTL_DSP_MAPOUTBUF: