From owner-svn-src-head@FreeBSD.ORG  Wed Jun 29 08:32:37 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EF5B6106566C;
	Wed, 29 Jun 2011 08:32:37 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E06758FC17;
	Wed, 29 Jun 2011 08:32:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5T8Wbm2086227;
	Wed, 29 Jun 2011 08:32:37 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5T8Wbrv086225;
	Wed, 29 Jun 2011 08:32:37 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201106290832.p5T8Wbrv086225@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 29 Jun 2011 08:32:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223663 - head/sys/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jun 2011 08:32:38 -0000

Author: avg
Date: Wed Jun 29 08:32:37 2011
New Revision: 223663
URL: http://svn.freebsd.org/changeset/base/223663

Log:
  add SNDCTL_DSP_HALT specified by OSS
  
  This is really a new name for SNDCTL_DSP_RESET.
  And this what commit r222723 should really have been in the first place.
  
  PR:		kern/156874
  Submitted by:	gerald
  MFC after:	1 week

Modified:
  head/sys/sys/soundcard.h

Modified: head/sys/sys/soundcard.h
==============================================================================
--- head/sys/sys/soundcard.h	Wed Jun 29 08:28:39 2011	(r223662)
+++ head/sys/sys/soundcard.h	Wed Jun 29 08:32:37 2011	(r223663)
@@ -775,7 +775,8 @@ typedef struct {
  * IOCTL commands for /dev/dsp and /dev/audio
  */
 
-#define SNDCTL_DSP_RESET	_IO  ('P', 0)
+#define SNDCTL_DSP_HALT		_IO  ('P', 0)
+#define SNDCTL_DSP_RESET	SNDCTL_DSP_HALT
 #define SNDCTL_DSP_SYNC		_IO  ('P', 1)
 #define SNDCTL_DSP_SPEED	_IOWR('P', 2, int)
 #define SNDCTL_DSP_STEREO	_IOWR('P', 3, int)