Changeset 1e92bc3 in mainline for uspace/drv/audio/hdaudio/codec.c

Timestamp:

2014-08-26T15:32:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9bae8b8

Parents:

c67195c

Message:

Enable interrupt in IRC and max all input and output amps.

File:

• uspace/drv/audio/hdaudio/codec.c (modified) (3 diffs)

uspace/drv/audio/hdaudio/codec.c

@@ -156 +156 @@
 }
 
+static int hda_set_out_amp_max(hda_codec_t *codec, uint8_t aw)
+{
+        uint32_t ampcaps;
+        uint32_t gmleft, gmright;
+        uint32_t offset;
+        int rc;
+
+        rc = hda_get_parameter(codec, aw,
+            hda_out_amp_caps, &ampcaps);
+        if (rc != EOK)
+                goto error;
+
+        rc = hda_get_amp_gain_mute(codec, aw, 0x8000, &gmleft);
+        if (rc != EOK)
+                goto error;
+
+        rc = hda_get_amp_gain_mute(codec, aw, 0xc000, &gmright);
+        if (rc != EOK)
+                goto error;
+
+        ddf_msg(LVL_NOTE, "out amp caps 0x%x "
+            "gain/mute: L:0x%x R:0x%x",
+            ampcaps, gmleft, gmright);
+        offset = ampcaps & 0x7f;
+
+        rc = hda_set_amp_gain_mute(codec, aw, 0xb000 + offset);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
+static int hda_set_in_amp_max(hda_codec_t *codec, uint8_t aw)
+{
+        uint32_t ampcaps;
+        uint32_t gmleft, gmright;
+        uint32_t offset;
+        int i;
+        int rc;
+
+        rc = hda_get_parameter(codec, aw,
+            hda_out_amp_caps, &ampcaps);
+        if (rc != EOK)
+                goto error;
+
+        ddf_msg(LVL_NOTE, "in amp caps 0x%x ", ampcaps);
+        offset = ampcaps & 0x7f;
+
+        for (i = 0; i < 15; i++) {
+                rc = hda_get_amp_gain_mute(codec, aw, 0x0000 + i, &gmleft);
+                if (rc != EOK)
+                        goto error;
+
+                rc = hda_get_amp_gain_mute(codec, aw, 0x4000 + i, &gmright);
+                if (rc != EOK)
+                        goto error;
+
+                ddf_msg(LVL_NOTE, "in:%d gain/mute: L:0x%x R:0x%x",
+                    i, gmleft, gmright);
+
+                rc = hda_set_amp_gain_mute(codec, aw, 0x7000 + (i << 8) + offset);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        return EOK;
+error:
+        return rc;
+}
+
 hda_codec_t *hda_codec_init(hda_t *hda, uint8_t address)
 {
@@ -218 +290 @@
                         } else if (awtype == awt_audio_output) {
                                 codec->out_aw = aw;
+                                codec->out_aw_list[codec->out_aw_num++] = aw;
                         }
 
-                        if ((awcaps & BIT_V(uint32_t, awc_out_amp_present)) != 0) {
-                                uint32_t ampcaps;
-                                uint32_t gmleft, gmright;
-
-                                rc = hda_get_parameter(codec, aw,
-                                    hda_out_amp_caps, &ampcaps);
-                                if (rc != EOK)
-                                        goto error;
-
-                                rc = hda_get_amp_gain_mute(codec, aw, 0x8000, &gmleft);
-                                if (rc != EOK)
-                                        goto error;
-
-                                rc = hda_get_amp_gain_mute(codec, aw, 0xc000, &gmright);
-                                if (rc != EOK)
-                                        goto error;
-
-                                ddf_msg(LVL_NOTE, "out amp caps 0x%x "
-                                    "gain/mute: L:0x%x R:0x%x",
-                                    ampcaps, gmleft, gmright);
-
-                                rc = hda_set_amp_gain_mute(codec, aw, 0xb04a);
-                                if (rc != EOK)
-                                        goto error;
-                        }
+                        if ((awcaps & BIT_V(uint32_t, awc_out_amp_present)) != 0)
+                                hda_set_out_amp_max(codec, aw);
+
+                        if ((awcaps & BIT_V(uint32_t, awc_in_amp_present)) != 0)
+                                hda_set_in_amp_max(codec, aw);
                 }
         }
@@ -275 +328 @@
 {
         int rc;
-
-        /* XXX Choose appropriate parameters */
-        uint32_t fmt;
-        /* 48 kHz, 16-bits, 1 channel */
-        fmt = (fmt_base_44khz << fmt_base) | (fmt_bits_16 << fmt_bits_l);
-
-        /* Configure converter */
-
-        ddf_msg(LVL_NOTE, "Configure converter format");
-        rc = hda_set_converter_fmt(codec, codec->out_aw, fmt);
-        if (rc != EOK)
-                goto error;
-
-        ddf_msg(LVL_NOTE, "Configure converter stream, channel");
-        rc = hda_set_converter_ctl(codec, codec->out_aw, sid, 0);
-        if (rc != EOK)
-                goto error;
+        int out_aw;
+        int i;
+
+        for (i = 0; i < codec->out_aw_num; i++) {
+                out_aw = codec->out_aw_list[i];
+
+                /* XXX Choose appropriate parameters */
+                uint32_t fmt;
+                /* 48 kHz, 16-bits, 1 channel */
+                fmt = (fmt_base_44khz << fmt_base) | (fmt_bits_16 << fmt_bits_l);
+
+                /* Configure converter */
+
+                ddf_msg(LVL_NOTE, "Configure converter format");
+                rc = hda_set_converter_fmt(codec, out_aw, fmt);
+                if (rc != EOK)
+                        goto error;
+
+                ddf_msg(LVL_NOTE, "Configure converter stream, channel");
+                rc = hda_set_converter_ctl(codec, out_aw, sid, 0);
+                if (rc != EOK)
+                        goto error;
+        }
 
         return EOK;