Changeset 2a7ba5e in mainline for uspace/lib/c/include

Timestamp:

2016-05-24T21:03:32Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

609f8d9c

Parents:

0a981e3 (diff), c170438 (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 async framework changes

Location:

uspace/lib/c/include

Files:

• async.h (modified) (1 diff)
• fibril.h (modified) (1 diff)
• ipc/ipc.h (modified) (1 diff)

uspace/lib/c/include/async.h

@@ -165 +165 @@
 extern int async_create_callback_port(async_exch_t *, iface_t, sysarg_t,
     sysarg_t, async_port_handler_t, void *, port_id_t *);
-
-extern void async_set_notification_handler_stack_size(size_t);
 
 extern int async_irq_subscribe(int, int, async_notification_handler_t, void *,

uspace/lib/c/include/fibril.h

@@ -78 +78 @@
         
         fibril_owner_info_t *waits_for;
+
+        unsigned switches;
 } fibril_t;
 

uspace/lib/c/include/ipc/ipc.h

@@ -89 +89 @@
  */
 
-#define ipc_call_async_0(phoneid, method, private, callback, can_preempt) \
+#define ipc_call_async_0(phoneid, method, private, callback) \
         ipc_call_async_fast((phoneid), (method), 0, 0, 0, 0, (private), \
-            (callback), (can_preempt))
-#define ipc_call_async_1(phoneid, method, arg1, private, callback, \
-    can_preempt) \
+            (callback))
+#define ipc_call_async_1(phoneid, method, arg1, private, callback) \
         ipc_call_async_fast((phoneid), (method), (arg1), 0, 0, 0, (private), \
-            (callback), (can_preempt))
-#define ipc_call_async_2(phoneid, method, arg1, arg2, private, callback, \
-    can_preempt) \
+            (callback))
+#define ipc_call_async_2(phoneid, method, arg1, arg2, private, callback) \
         ipc_call_async_fast((phoneid), (method), (arg1), (arg2), 0, 0, \
-            (private), (callback), (can_preempt))
-#define ipc_call_async_3(phoneid, method, arg1, arg2, arg3, private, callback, \
-    can_preempt) \
+            (private), (callback))
+#define ipc_call_async_3(phoneid, method, arg1, arg2, arg3, private, callback) \
         ipc_call_async_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, \
-            (private), (callback), (can_preempt))
+            (private), (callback))
 #define ipc_call_async_4(phoneid, method, arg1, arg2, arg3, arg4, private, \
-    callback, can_preempt) \
+    callback) \
         ipc_call_async_fast((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), (private), (callback), (can_preempt))
+            (arg4), (private), (callback))
 #define ipc_call_async_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, \
-    private, callback, can_preempt) \
+    private, callback) \
         ipc_call_async_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), (arg5), (private), (callback), (can_preempt))
+            (arg4), (arg5), (private), (callback))
 
 extern void ipc_call_async_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, void *, ipc_async_callback_t, bool);
+    sysarg_t, void *, ipc_async_callback_t);
 extern void ipc_call_async_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
+    sysarg_t, sysarg_t, void *, ipc_async_callback_t);
 
 extern int ipc_hangup(int);