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

Add external connector jack color into widget names.

Browse Source 
It should help users to identify them while reading verbose messages.
This commit is contained in:
Alexander Motin 2009-01-08 19:43:47 +00:00
parent 71624181c8
commit 78bb0fa358
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2443,9 +2443,10 @@ hdac_widget_pin_parse(struct hdac_widget *w)
{ {
struct hdac_softc *sc = w->devinfo->codec->sc; struct hdac_softc *sc = w->devinfo->codec->sc;
uint32_t config, pincap; uint32_t config, pincap;
const char *devstr, *connstr; const char *devstr;
nid_t cad = w->devinfo->codec->cad; nid_t cad = w->devinfo->codec->cad;
nid_t nid = w->nid; nid_t nid = w->nid;
int conn, color;
config = hdac_widget_pin_getconfig(w); config = hdac_widget_pin_getconfig(w);
w->wclass.pin.config = config; w->wclass.pin.config = config;
@ -2467,13 +2468,19 @@ hdac_widget_pin_parse(struct hdac_widget *w)
devstr = HDA_DEVS[(config & HDA_CONFIG_DEFAULTCONF_DEVICE_MASK) >> devstr = HDA_DEVS[(config & HDA_CONFIG_DEFAULTCONF_DEVICE_MASK) >>
HDA_CONFIG_DEFAULTCONF_DEVICE_SHIFT]; HDA_CONFIG_DEFAULTCONF_DEVICE_SHIFT];
connstr = HDA_CONNS[(config & HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_MASK) >> conn = (config & HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_MASK) >>
HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_SHIFT]; HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_SHIFT;
color = (config & HDA_CONFIG_DEFAULTCONF_COLOR_MASK) >>
HDA_CONFIG_DEFAULTCONF_COLOR_SHIFT;
strlcat(w->name, ": ", sizeof(w->name)); strlcat(w->name, ": ", sizeof(w->name));
strlcat(w->name, devstr, sizeof(w->name)); strlcat(w->name, devstr, sizeof(w->name));
strlcat(w->name, " (", sizeof(w->name)); strlcat(w->name, " (", sizeof(w->name));
strlcat(w->name, connstr, sizeof(w->name)); if (conn == 0 && color != 0 && color != 15) {
strlcat(w->name, HDA_COLORS[color], sizeof(w->name));
strlcat(w->name, " ", sizeof(w->name));
}
strlcat(w->name, HDA_CONNS[conn], sizeof(w->name));
strlcat(w->name, ")", sizeof(w->name)); strlcat(w->name, ")", sizeof(w->name));
} }