Changeset dda5848 in mainline

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.

Location:

uspace/drv/audio/hdaudio

Files:

• codec.c (modified) (4 diffs)
• codec.h (modified) (1 diff)
• hdactl.c (modified) (5 diffs)
• hdactl.h (modified) (1 diff)

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");

uspace/drv/audio/hdaudio/codec.h

@@ -43 +43 @@
         hda_t *hda;
         uint8_t address;
-        uint8_t out_aw;
         uint8_t out_aw_list[MAX_OUT_AW];
         int out_aw_num;

uspace/drv/audio/hdaudio/hdactl.c

@@ -106 +106 @@
  *
  * We always use the largest available size. In @a sizecap each of bits
- * 0, 1, 2 determine whether one of the supported size (0 == 2 enries,
+ * 0, 1, 2 determine whether one of the supported size (0 == 2 entries,
  * 1 == 16 entries, 2 == 256 entries) is supported. @a *selsz is set to
  * one of 0, 1, 2 on success.
@@ -249 +249 @@
         }
         rirbsz = rirbsz & ~BIT_RANGE(uint8_t, rirbsize_size_h, rirbsize_size_l);
-        rirbsz = rirbsz | selsz;
+        rirbsz = rirbsz | (selsz << rirbsize_size_l);
 
         ddf_msg(LVL_NOTE, "Setting RIRB Size register to 0x%x", rirbsz);
@@ -395 +395 @@
                 return ENOENT;
 
-        ++hda->ctl->rirb_rp;
+        hda->ctl->rirb_rp = (hda->ctl->rirb_rp + 1) % hda->ctl->rirb_entries;
         resp = rirb[hda->ctl->rirb_rp];
 
@@ -415 +415 @@
         while (count > 0) {
                 while (count > 0 && hda->ctl->solrb_rp != hda->ctl->solrb_wp) {
-                        ++hda->ctl->solrb_rp;
+                        hda->ctl->solrb_rp = (hda->ctl->solrb_rp + 1) % softrb_entries;
                         resp = hda->ctl->solrb[hda->ctl->solrb_rp];
 
@@ -629 +629 @@
 }
 
+void hda_ctl_dump_info(hda_ctl_t *ctl)
+{
+        ddf_msg(LVL_NOTE, "corbwp=%d, corbrp=%d",
+            hda_reg16_read(&ctl->hda->regs->corbwp),
+            hda_reg16_read(&ctl->hda->regs->corbrp));
+        ddf_msg(LVL_NOTE, "corbctl=0x%x, corbsts=0x%x",
+            hda_reg8_read(&ctl->hda->regs->corbctl),
+            hda_reg8_read(&ctl->hda->regs->corbsts));
+        ddf_msg(LVL_NOTE, "rirbwp=0x%x, soft-rirbrp=0x%x",
+            hda_reg16_read(&ctl->hda->regs->rirbwp),
+            ctl->rirb_rp);
+        ddf_msg(LVL_NOTE, "solrb_wp=0x%x, solrb_rp=0x%x",
+            ctl->solrb_wp, ctl->solrb_wp);
+}
+
 /** @}
  */

uspace/drv/audio/hdaudio/hdactl.h

@@ -79 +79 @@
 extern void hda_ctl_interrupt(hda_ctl_t *);
 extern int hda_cmd(hda_t *, uint32_t, uint32_t *);
+extern void hda_ctl_dump_info(hda_ctl_t *);
 
 #endif