Changeset c4f67c8 in mainline

Timestamp:

2014-09-09T22:18:53Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

105d8d6

Parents:

57a2208

Message:

Make solrb reading not slow.

File:

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

uspace/drv/audio/hdaudio/hdactl.c

@@ -52 +52 @@
         codec_enum_wait_us = 512,
         corb_wait_max = 10,
-        rirb_wait_max = 100
+        rirb_wait_max = 100,
+        solrb_wait_us = 100 * 1000
 };
 
@@ -438 +439 @@
 {
         hda_rirb_entry_t resp;
-        int wcnt;
 
         ddf_msg(LVL_DEBUG, "hda_solrb_read()");
@@ -459 +459 @@
 
                 if (count > 0) {
-                        wcnt = 100;
-                        while (wcnt > 0 && hda->ctl->solrb_wp == hda->ctl->solrb_rp) {
-                                fibril_mutex_unlock(&hda->ctl->solrb_lock);
-                                async_usleep(10000);
-                                fibril_mutex_lock(&hda->ctl->solrb_lock);
-                                --wcnt;
+                        if (hda->ctl->solrb_wp == hda->ctl->solrb_rp) {
+                                fibril_condvar_wait_timeout(
+                                    &hda->ctl->solrb_cv, &hda->ctl->solrb_lock,
+                                    solrb_wait_us);
                         }