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

Timestamp:

2014-08-26T23:07:47Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9034876

Parents:

2f6b916

Message:

Fix buffer overrun errors.

File:

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

uspace/drv/audio/hdaudio/codec.c

@@ -56 +56 @@
         verb = (codec->address << 28) | (node << 20) | (vid << 8) | payload;
         int rc = hda_cmd(codec->hda, verb, resp);
+/*
         if (resp != NULL) {
                 ddf_msg(LVL_NOTE, "verb 0x%" PRIx32 " -> 0x%" PRIx32, verb,
@@ -62 +63 @@
                 ddf_msg(LVL_NOTE, "verb 0x%" PRIx32, verb);
         }
+*/
         return rc;
 }
@@ -409 +411 @@
 
                         } else if (awtype == awt_audio_output) {
-                                codec->out_aw = aw;
                                 codec->out_aw_list[codec->out_aw_num++] = aw;
+
+                                rc = hda_get_supp_rates(codec, aw, &rates);
+                                if (rc != EOK)
+                                        goto error;
+
+                                rc = hda_get_supp_formats(codec, aw, &formats);
+                                if (rc != EOK)
+                                        goto error;
+
+                                ddf_msg(LVL_NOTE, "Output widget %d: rates=0x%x formats=0x%x",
+                                    aw, rates, formats);
                         }
 
-if (0) {
                         if ((awcaps & BIT_V(uint32_t, awc_out_amp_present)) != 0)
                                 hda_set_out_amp_max(codec, aw);
@@ -419 +430 @@
                         if ((awcaps & BIT_V(uint32_t, awc_in_amp_present)) != 0)
                                 hda_set_in_amp_max(codec, aw);
-}
                 }
         }
 
-        rc = hda_get_supp_rates(codec, codec->out_aw, &rates);
-        if (rc != EOK)
-                goto error;
-
-        rc = hda_get_supp_formats(codec, codec->out_aw, &formats);
-        if (rc != EOK)
-                goto error;
-
-        ddf_msg(LVL_NOTE, "Output widget %d: rates=0x%x formats=0x%x",
-            codec->out_aw, rates, formats);
+        hda_ctl_dump_info(hda->ctl);
 
         ddf_msg(LVL_NOTE, "Codec OK");