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

uspace/drv/audio/hdaudio/hdactl.c

@@ -55 +55 @@
 };
 
+static void hda_ctl_process_rirb(hda_ctl_t *);
+
 /** Perform set-reset handshake on a 16-bit register.
  *
@@ -407 +409 @@
         int wcnt;
 
-        ddf_msg(LVL_NOTE, "hda_solrb_read()");
-        wcnt = 100;
-
-        ddf_msg(LVL_NOTE, "hda_solrb_read() - lock mutex");
+        ddf_msg(LVL_DEBUG, "hda_solrb_read()");
+
         fibril_mutex_lock(&hda->ctl->solrb_lock);
 
         while (count > 0) {
-                ddf_msg(LVL_NOTE, "hda_solrb_read() - while(1)");
                 while (count > 0 && hda->ctl->solrb_rp != hda->ctl->solrb_wp) {
-                        ddf_msg(LVL_NOTE, "hda_solrb_read() - while(2)");
                         ++hda->ctl->solrb_rp;
                         resp = hda->ctl->solrb[hda->ctl->solrb_rp];
 
-                        ddf_msg(LVL_NOTE, "solrb RESPONSE resp=0x%x respex=0x%x",
+                        ddf_msg(LVL_DEBUG2, "solrb RESPONSE resp=0x%x respex=0x%x",
                             resp.resp, resp.respex);
                         if ((resp.respex & BIT_V(uint32_t, respex_unsol)) == 0) {
@@ -430 +428 @@
 
                 if (count > 0) {
-                        ddf_msg(LVL_NOTE, "hda_solrb_read() - count > 0");
+                        wcnt = 100;
                         while (wcnt > 0 && hda->ctl->solrb_wp == hda->ctl->solrb_rp) {
-                                ddf_msg(LVL_NOTE, "hda_solrb_read() - while(3), wcnt=%d", wcnt);
                                 fibril_mutex_unlock(&hda->ctl->solrb_lock);
-                                ddf_msg(LVL_NOTE, "hda_solrb_read() - sleep");
                                 async_usleep(10000);
-                                ddf_msg(LVL_NOTE, "hda_solrb_read() - re-lock");
                                 fibril_mutex_lock(&hda->ctl->solrb_lock);
                                 --wcnt;
@@ -442 +437 @@
 
                         if (hda->ctl->solrb_wp == hda->ctl->solrb_rp) {
+                                ddf_msg(LVL_NOTE, "hda_solrb_read() - last ditch effort process RIRB");
+                                fibril_mutex_unlock(&hda->ctl->solrb_lock);
+                                hda_ctl_process_rirb(hda->ctl);
+                                fibril_mutex_lock(&hda->ctl->solrb_lock);
+                        }
+
+                        if (hda->ctl->solrb_wp == hda->ctl->solrb_rp) {
                                 ddf_msg(LVL_NOTE, "hda_solrb_read() time out");
-                                ddf_msg(LVL_NOTE, "corbwp=%d corbrp=%d",
-                                    hda_reg16_read(&hda->regs->corbwp),
-                                    hda_reg16_read(&hda->regs->corbrp));
-                                ddf_msg(LVL_NOTE, "corbctl=0x%x, corbsts=0x%x",
-                                    hda_reg8_read(&hda->regs->corbctl),
-                                    hda_reg8_read(&hda->regs->corbsts));
-                                ddf_msg(LVL_NOTE, "rirbwp=%d",
-                                    hda_reg16_read(&hda->regs->rirbwp));
-                                ddf_msg(LVL_NOTE, "rirbctl=0x%x, rirbsts=0x%x",
-                                    hda_reg8_read(&hda->regs->rirbctl),
-                                    hda_reg8_read(&hda->regs->rirbsts));
                                 fibril_mutex_unlock(&hda->ctl->solrb_lock);
                                 return ETIMEOUT;
@@ -461 +452 @@
 
         fibril_mutex_unlock(&hda->ctl->solrb_lock);
-        ddf_msg(LVL_NOTE, "hda_solrb_read() success");
         return EOK;
 }
@@ -613 +603 @@
 }
 
-void hda_ctl_interrupt(hda_ctl_t *ctl)
+static void hda_ctl_process_rirb(hda_ctl_t *ctl)
 {
         hda_rirb_entry_t resp;
@@ -625 +615 @@
                 }
 
-                ddf_msg(LVL_NOTE, "writing to solrb");
+                ddf_msg(LVL_DEBUG2, "writing to solrb");
                 fibril_mutex_lock(&ctl->solrb_lock);
                 ctl->solrb_wp = (ctl->solrb_wp + 1) % softrb_entries;
@@ -634 +624 @@
 }
 
+void hda_ctl_interrupt(hda_ctl_t *ctl)
+{
+        hda_ctl_process_rirb(ctl);
+}
+
 /** @}
  */