From owner-svn-src-all@FreeBSD.ORG  Thu Jan 21 09:11:51 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 2307B1065670;
	Thu, 21 Jan 2010 09:11:51 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 12C208FC1F;
	Thu, 21 Jan 2010 09:11:51 +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 o0L9Boqk079402;
	Thu, 21 Jan 2010 09:11:50 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0L9BoPX079400;
	Thu, 21 Jan 2010 09:11:50 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201001210911.o0L9BoPX079400@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 21 Jan 2010 09:11:50 +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: r202736 - head/sys/dev/sound/pci/hda
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, 21 Jan 2010 09:11:51 -0000

Author: mav
Date: Thu Jan 21 09:11:50 2010
New Revision: 202736
URL: http://svn.freebsd.org/changeset/base/202736

Log:
  Print playback channels paths in order of their sequence numbers, not nids.

Modified:
  head/sys/dev/sound/pci/hda/hdac.c

Modified: head/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdac.c	Thu Jan 21 08:53:01 2010	(r202735)
+++ head/sys/dev/sound/pci/hda/hdac.c	Thu Jan 21 09:11:50 2010	(r202736)
@@ -7091,19 +7091,19 @@ hdac_dump_dac(struct hdac_pcm_devinfo *p
 {
 	struct hdac_devinfo *devinfo = pdevinfo->devinfo;
 	struct hdac_softc *sc = devinfo->codec->sc;
+	struct hdac_audio_as *as;
 	struct hdac_widget *w;
 	int i, printed = 0;
 
 	if (pdevinfo->play < 0)
 		return;
 
-	for (i = devinfo->startnode; i < devinfo->endnode; i++) {
-		w = hdac_widget_get(devinfo, i);
-		if (w == NULL || w->enable == 0)
+	as = &devinfo->function.audio.as[sc->chans[pdevinfo->play].as];
+	for (i = 0; i < 16; i++) {
+		if (as->pins[i] <= 0)
 			continue;
-		if (w->type != HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX)
-			continue;
-		if (w->bindas != sc->chans[pdevinfo->play].as)
+		w = hdac_widget_get(devinfo, as->pins[i]);
+		if (w == NULL || w->enable == 0)
 			continue;
 		if (printed == 0) {
 			printed = 1;
@@ -7111,7 +7111,7 @@ hdac_dump_dac(struct hdac_pcm_devinfo *p
 			device_printf(pdevinfo->dev, "Playback:\n");
 		}
 		device_printf(pdevinfo->dev, "\n");
-		hdac_dump_dst_nid(pdevinfo, i, 0);
+		hdac_dump_dst_nid(pdevinfo, as->pins[i], 0);
 	}
 }