ALSA: hda: add snd_hda_get_jack* functions

This patch adds snd_hda_get_jack* functions for reporting jack location,
device, and connectivity type.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 3 insertions, 36 deletions

diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 64ab19f14f79..b36d4d06485d 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -145,32 +145,6 @@ static void print_pcm_caps(struct snd_info_buffer *buffer,
         print_pcm_formats(buffer, stream);
 }
 
-static const char *get_jack_location(u32 cfg)
-{
-        static char *bases[7] = {
-                "N/A", "Rear", "Front", "Left", "Right", "Top", "Bottom",
-        };
-        static unsigned char specials_idx[] = {
-                0x07, 0x08,
-                0x17, 0x18, 0x19,
-                0x37, 0x38
-        };
-        static char *specials[] = {
-                "Rear Panel", "Drive Bar",
-                "Riser", "HDMI", "ATAPI",
-                "Mobile-In", "Mobile-Out"
-        };
-        int i;
-        cfg = (cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT;
-        if ((cfg & 0x0f) < 7)
-                return bases[cfg & 0x0f];
-        for (i = 0; i < ARRAY_SIZE(specials_idx); i++) {
-                if (cfg == specials_idx[i])
-                        return specials[i];
-        }
-        return "UNKNOWN";
-}
-
 static const char *get_jack_connection(u32 cfg)
 {
         static char *names[16] = {
@@ -206,13 +180,6 @@ static void print_pin_caps(struct snd_info_buffer *buffer,
                            int *supports_vref)
 {
         static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" };
-        static char *jack_types[16] = {
-                "Line Out", "Speaker", "HP Out", "CD",
-                "SPDIF Out", "Digital Out", "Modem Line", "Modem Hand",
-                "Line In", "Aux", "Mic", "Telephony",
-                "SPDIF In", "Digitial In", "Reserved", "Other"
-        };
-        static char *jack_locations[4] = { "Ext", "Int", "Sep", "Oth" };
         unsigned int caps, val;
 
         caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
@@ -274,9 +241,9 @@ static void print_pin_caps(struct snd_info_buffer *buffer,
         caps = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
         snd_iprintf(buffer, "  Pin Default 0x%08x: [%s] %s at %s %s\n", caps,
                     jack_conns[(caps & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT],
-                    jack_types[(caps & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT],
-                    jack_locations[(caps >> (AC_DEFCFG_LOCATION_SHIFT + 4)) & 3],
-                    get_jack_location(caps));
+                    snd_hda_get_jack_type(caps),
+                    snd_hda_get_jack_connectivity(caps),
+                    snd_hda_get_jack_location(caps));
         snd_iprintf(buffer, "    Conn = %s, Color = %s\n",
                     get_jack_connection(caps),
                     get_jack_color(caps));