Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 120514
b: refs/heads/master
c: 2d34e1b
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai committed Nov 28, 2008
1 parent 22e8338 commit fc36c18
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb40abe223ace0b6f29e8433d3936dac664178b5
refs/heads/master: 2d34e1b3bb991a99322fb55681d1e73ada3de35c
2 changes: 2 additions & 0 deletions trunk/sound/pci/hda/hda_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,8 @@ static void print_codec_info(struct snd_info_entry *entry,
}

print_gpio(buffer, codec, codec->afg);
if (codec->proc_widget_hook)
codec->proc_widget_hook(buffer, codec, codec->afg);

for (i = 0; i < nodes; i++, nid++) {
unsigned int wid_caps =
Expand Down
56 changes: 56 additions & 0 deletions trunk/sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -4262,6 +4262,52 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
}
}

#ifdef CONFIG_PROC_FS
static void stac92hd_proc_hook(struct snd_info_buffer *buffer,
struct hda_codec *codec, hda_nid_t nid)
{
if (nid == codec->afg)
snd_iprintf(buffer, "Power-Map: 0x%02x\n",
snd_hda_codec_read(codec, nid, 0, 0x0fec, 0x0));
}

static void analog_loop_proc_hook(struct snd_info_buffer *buffer,
struct hda_codec *codec,
unsigned int verb)
{
snd_iprintf(buffer, "Analog Loopback: 0x%02x\n",
snd_hda_codec_read(codec, codec->afg, 0, verb, 0));
}

/* stac92hd71bxx, stac92hd73xx */
static void stac92hd7x_proc_hook(struct snd_info_buffer *buffer,
struct hda_codec *codec, hda_nid_t nid)
{
stac92hd_proc_hook(buffer, codec, nid);
if (nid == codec->afg)
analog_loop_proc_hook(buffer, codec, 0xfa0);
}

static void stac9205_proc_hook(struct snd_info_buffer *buffer,
struct hda_codec *codec, hda_nid_t nid)
{
if (nid == codec->afg)
analog_loop_proc_hook(buffer, codec, 0xfe0);
}

static void stac927x_proc_hook(struct snd_info_buffer *buffer,
struct hda_codec *codec, hda_nid_t nid)
{
if (nid == codec->afg)
analog_loop_proc_hook(buffer, codec, 0xfeb);
}
#else
#define stac92hd_proc_hook NULL
#define stac92hd7x_proc_hook NULL
#define stac9205_proc_hook NULL
#define stac927x_proc_hook NULL
#endif

#ifdef SND_HDA_NEEDS_RESUME
static int stac92xx_resume(struct hda_codec *codec)
{
Expand Down Expand Up @@ -4585,6 +4631,8 @@ static int patch_stac92hd73xx(struct hda_codec *codec)

codec->patch_ops = stac92xx_patch_ops;

codec->proc_widget_hook = stac92hd7x_proc_hook;

return 0;
}

Expand Down Expand Up @@ -4671,6 +4719,8 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)

codec->patch_ops = stac92xx_patch_ops;

codec->proc_widget_hook = stac92hd_proc_hook;

return 0;
}

Expand Down Expand Up @@ -4889,6 +4939,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
return err;
}

codec->proc_widget_hook = stac92hd7x_proc_hook;

return 0;
};

Expand Down Expand Up @@ -5109,6 +5161,8 @@ static int patch_stac927x(struct hda_codec *codec)

codec->patch_ops = stac92xx_patch_ops;

codec->proc_widget_hook = stac927x_proc_hook;

/*
* !!FIXME!!
* The STAC927x seem to require fairly long delays for certain
Expand Down Expand Up @@ -5224,6 +5278,8 @@ static int patch_stac9205(struct hda_codec *codec)

codec->patch_ops = stac92xx_patch_ops;

codec->proc_widget_hook = stac9205_proc_hook;

return 0;
}

Expand Down

0 comments on commit fc36c18

Please sign in to comment.