Changeset dda5848 in mainline for uspace/drv/audio/hdaudio/hdactl.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/hdactl.c (modified) (5 diffs)

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);
+}
+
 /** @}
  */