Changeset 8e7c9fe in mainline for uspace/lib/c/include/fibril_synch.h

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/c/include/fibril_synch.h (modified) (3 diffs)

uspace/lib/c/include/fibril_synch.h

@@ -116 +116 @@
         /** Timer has fired and has not been cleared since */
         fts_fired,
-        /** Timer is being destroyed */
-        fts_cleanup
+        /** Timer fibril is requested to terminate */
+        fts_cleanup,
+        /** Timer fibril acknowledged termination */
+        fts_clean
 } fibril_timer_state_t;
 
@@ -129 +131 @@
 typedef struct {
         fibril_mutex_t lock;
+        fibril_mutex_t *lockp;
         fibril_condvar_t cv;
         fid_t fibril;
         fibril_timer_state_t state;
+        bool handler_running;
 
         suseconds_t delay;
@@ -160 +164 @@
 extern void fibril_condvar_broadcast(fibril_condvar_t *);
 
-extern fibril_timer_t *fibril_timer_create(void);
+extern fibril_timer_t *fibril_timer_create(fibril_mutex_t *);
 extern void fibril_timer_destroy(fibril_timer_t *);
 extern void fibril_timer_set(fibril_timer_t *, suseconds_t, fibril_timer_fun_t,
     void *);
+extern void fibril_timer_set_locked(fibril_timer_t *, suseconds_t,
+    fibril_timer_fun_t, void *);
 extern fibril_timer_state_t fibril_timer_clear(fibril_timer_t *);
+extern fibril_timer_state_t fibril_timer_clear_locked(fibril_timer_t *);
 
 #endif