Author: mav
Date: Fri Dec 11 01:11:56 2009
New Revision: 200379
URL: http://svn.freebsd.org/changeset/base/200379
Log:
MFC r196762:
Improve HDA controller capabilities logging.
Modified:
stable/7/sys/dev/sound/pci/hda/hdac.c
stable/7/sys/dev/sound/pci/hda/hdac_private.h
stable/7/sys/dev/sound/pci/hda/hdac_reg.h
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/7/sys/dev/sound/pci/hda/hdac.c Fri Dec 11 01:06:30 2009
(r200378)
+++ stable/7/sys/dev/sound/pci/hda/hdac.c Fri Dec 11 01:11:56 2009
(r200379)
@@ -1516,7 +1516,7 @@ hdac_get_capabilities(struct hdac_softc
sc->num_iss = HDAC_GCAP_ISS(gcap);
sc->num_oss = HDAC_GCAP_OSS(gcap);
sc->num_bss = HDAC_GCAP_BSS(gcap);
-
+ sc->num_sdo = HDAC_GCAP_NSDO(gcap);
sc->support_64bit = HDA_FLAG_MATCH(gcap, HDAC_GCAP_64OK);
corbsize = HDAC_READ_1(&sc->mem, HDAC_CORBSIZE);
@@ -1551,11 +1551,12 @@ hdac_get_capabilities(struct hdac_softc
return (ENXIO);
}
- HDA_BOOTHVERBOSE(
- device_printf(sc->dev, " CORB size: %d\n", sc->corb_size);
- device_printf(sc->dev, " RIRB size: %d\n", sc->rirb_size);
- device_printf(sc->dev, " Streams: ISS=%d OSS=%d BSS=%d\n",
- sc->num_iss, sc->num_oss, sc->num_bss);
+ HDA_BOOTVERBOSE(
+ device_printf(sc->dev, "Caps: OSS %d, ISS %d, BSS %d, "
+ "NSDO %d%s, CORB %d, RIRB %d\n",
+ sc->num_oss, sc->num_iss, sc->num_bss, 1 << sc->num_sdo,
+ sc->support_64bit ? ", 64bit" : "",
+ sc->corb_size, sc->rirb_size);
);
return (0);
Modified: stable/7/sys/dev/sound/pci/hda/hdac_private.h
==============================================================================
--- stable/7/sys/dev/sound/pci/hda/hdac_private.h Fri Dec 11 01:06:30
2009 (r200378)
+++ stable/7/sys/dev/sound/pci/hda/hdac_private.h Fri Dec 11 01:11:56
2009 (r200379)
@@ -339,6 +339,7 @@ struct hdac_softc {
int num_iss;
int num_oss;
int num_bss;
+ int num_sdo;
int support_64bit;
int streamcnt;
Modified: stable/7/sys/dev/sound/pci/hda/hdac_reg.h
==============================================================================
--- stable/7/sys/dev/sound/pci/hda/hdac_reg.h Fri Dec 11 01:06:30 2009
(r200378)
+++ stable/7/sys/dev/sound/pci/hda/hdac_reg.h Fri Dec 11 01:11:56 2009
(r200379)
@@ -136,6 +136,8 @@
(((gcap) & HDAC_GCAP_ISS_MASK) >> HDAC_GCAP_ISS_SHIFT)
#define HDAC_GCAP_OSS(gcap) \
(((gcap) & HDAC_GCAP_OSS_MASK) >> HDAC_GCAP_OSS_SHIFT)
+#define HDAC_GCAP_NSDO(gcap) \
+ (((gcap) & HDAC_GCAP_NSDO_MASK) >> HDAC_GCAP_NSDO_SHIFT)
/* GCTL - Global Control */
#define HDAC_GCTL_CRST 0x00000001
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
