d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve HDA controller capabilities logging.

Browse Source
This commit is contained in:
Alexander Motin 2009-09-02 11:39:19 +00:00
parent 2689ba2720
commit 46681d6e45
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/sound/pci/hda/hdac.c
View File

@ -1520,7 +1520,7 @@ hdac_get_capabilities(struct hdac_softc *sc)
sc->num_iss = HDAC_GCAP_ISS(gcap); sc->num_iss = HDAC_GCAP_ISS(gcap);
sc->num_oss = HDAC_GCAP_OSS(gcap); sc->num_oss = HDAC_GCAP_OSS(gcap);
sc->num_bss = HDAC_GCAP_BSS(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); sc->support_64bit = HDA_FLAG_MATCH(gcap, HDAC_GCAP_64OK);
corbsize = HDAC_READ_1(&sc->mem, HDAC_CORBSIZE); corbsize = HDAC_READ_1(&sc->mem, HDAC_CORBSIZE);
@ -1555,11 +1555,12 @@ hdac_get_capabilities(struct hdac_softc *sc)
return (ENXIO); return (ENXIO);
} }
HDA_BOOTHVERBOSE( HDA_BOOTVERBOSE(
device_printf(sc->dev, " CORB size: %d\n", sc->corb_size); device_printf(sc->dev, "Caps: OSS %d, ISS %d, BSS %d, "
device_printf(sc->dev, " RIRB size: %d\n", sc->rirb_size); "NSDO %d%s, CORB %d, RIRB %d\n",
device_printf(sc->dev, " Streams: ISS=%d OSS=%d BSS=%d\n", sc->num_oss, sc->num_iss, sc->num_bss, 1 << sc->num_sdo,
sc->num_iss, sc->num_oss, sc->num_bss); sc->support_64bit ? ", 64bit" : "",
sc->corb_size, sc->rirb_size);
); );
return (0); return (0);

1
sys/dev/sound/pci/hda/hdac_private.h
View File

@ -339,6 +339,7 @@ struct hdac_softc {
int num_iss; int num_iss;
int num_oss; int num_oss;
int num_bss; int num_bss;
int num_sdo;
int support_64bit; int support_64bit;
int streamcnt; int streamcnt;

2
sys/dev/sound/pci/hda/hdac_reg.h
View File

@ -136,6 +136,8 @@
(((gcap) & HDAC_GCAP_ISS_MASK) >> HDAC_GCAP_ISS_SHIFT) (((gcap) & HDAC_GCAP_ISS_MASK) >> HDAC_GCAP_ISS_SHIFT)
#define HDAC_GCAP_OSS(gcap) \ #define HDAC_GCAP_OSS(gcap) \
(((gcap) & HDAC_GCAP_OSS_MASK) >> HDAC_GCAP_OSS_SHIFT) (((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 */ /* GCTL - Global Control */
#define HDAC_GCTL_CRST 0x00000001 #define HDAC_GCTL_CRST 0x00000001