From owner-svn-src-all@FreeBSD.ORG  Thu Apr  1 11:30:46 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C764A1065670;
	Thu,  1 Apr 2010 11:30:46 +0000 (UTC)
	(envelope-from joel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B6D768FC12;
	Thu,  1 Apr 2010 11:30:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o31BUkNC017373;
	Thu, 1 Apr 2010 11:30:46 GMT (envelope-from joel@svn.freebsd.org)
Received: (from joel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o31BUk3p017371;
	Thu, 1 Apr 2010 11:30:46 GMT (envelope-from joel@svn.freebsd.org)
Message-Id: <201004011130.o31BUk3p017371@svn.freebsd.org>
From: Joel Dahl <joel@FreeBSD.org>
Date: Thu, 1 Apr 2010 11:30:46 +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: r206033 - head/sys/dev/sound/pci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Apr 2010 11:30:46 -0000

Author: joel (doc committer)
Date: Thu Apr  1 11:30:46 2010
New Revision: 206033
URL: http://svn.freebsd.org/changeset/base/206033

Log:
  Fix the gap between mute and lowest possible volume. The es1370 mixer
  volumes were incorrectly calculated.
  
  I've tested this with one of my es1370 cards and I can confirm that it
  works.
  
  PR:		98167
  Submitted by:	Joseph Terner <jtsn@gmx.de>
  Approved by:	kib

Modified:
  head/sys/dev/sound/pci/es137x.c

Modified: head/sys/dev/sound/pci/es137x.c
==============================================================================
--- head/sys/dev/sound/pci/es137x.c	Thu Apr  1 10:41:01 2010	(r206032)
+++ head/sys/dev/sound/pci/es137x.c	Thu Apr  1 11:30:46 2010	(r206033)
@@ -355,7 +355,7 @@ es1370_mixset(struct snd_mixer *m, unsig
 	if (mixtable[dev].left == 0xf)
 		rl = (l < 2) ? 0x80 : 7 - (l - 2) / 14;
 	else
-		rl = (l < 10) ? 0x80 : 15 - (l - 10) / 6;
+		rl = (l < 7) ? 0x80 : 31 - (l - 7) / 3;
 	es = mix_getdevinfo(m);
 	ES_LOCK(es);
 	if (dev == SOUND_MIXER_PCM && (ES_SINGLE_PCM_MIX(es->escfg)) &&
@@ -364,7 +364,7 @@ es1370_mixset(struct snd_mixer *m, unsig
 	else
 		set_dac1 = 0;
 	if (mixtable[dev].stereo) {
-		rr = (r < 10) ? 0x80 : 15 - (r - 10) / 6;
+		rr = (r < 7) ? 0x80 : 31 - (r - 7) / 3;
 		es1370_wrcodec(es, mixtable[dev].right, rr);
 		if (set_dac1 && mixtable[SOUND_MIXER_SYNTH].stereo)
 			es1370_wrcodec(es,