svn commit: r203512 - stable/8/sys/dev/sound/pci/hda
Alexander Motin
mav at FreeBSD.org
Fri Feb 5 08:32:08 UTC 2010
Author: mav
Date: Fri Feb 5 08:32:07 2010
New Revision: 203512
URL: http://svn.freebsd.org/changeset/base/203512
Log:
MFC r202736:
Print playback channels paths in order of their sequence numbers, not nids.
Modified:
stable/8/sys/dev/sound/pci/hda/hdac.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/8/sys/dev/sound/pci/hda/hdac.c Fri Feb 5 06:36:03 2010 (r203511)
+++ stable/8/sys/dev/sound/pci/hda/hdac.c Fri Feb 5 08:32:07 2010 (r203512)
@@ -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);
}
}
More information about the svn-src-stable-8
mailing list