Changeset 132ab5d1 in mainline for uspace/lib/c/test/fibril/timer.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/test/fibril/timer.c (modified) (4 diffs)

uspace/lib/c/test/fibril/timer.c

@@ -27 +27 @@
  */
 
+#include <async.h>
 #include <fibril_synch.h>
 #include <pcut/pcut.h>
@@ -77 +78 @@
 
         fibril_timer_set_locked(t, 100 * 1000 * 1000, test_timeout_fn, &cnt);
-        fibril_usleep(1000);
+        async_usleep(1000);
         fts = fibril_timer_clear_locked(t);
         PCUT_ASSERT_INT_EQUALS(fts_active, fts);
@@ -100 +101 @@
         cnt = 0;
         fibril_timer_set(t, 100 * 1000 * 1000, test_timeout_fn, &cnt);
-        fibril_usleep(1000);
+        async_usleep(1000);
         fts = fibril_timer_clear(t);
         PCUT_ASSERT_INT_EQUALS(fts_active, fts);
@@ -126 +127 @@
         fibril_mutex_unlock(&lock);
 
-        fibril_usleep(1000);
+        async_usleep(1000);
 
         fibril_mutex_lock(&lock);