Changes in uspace/lib/c/include/async.h [ae6021d:b4df8db] in mainline

File:

• uspace/lib/c/include/async.h (modified) (10 diffs)

uspace/lib/c/include/async.h

@@ -45 +45 @@
 #include <atomic.h>
 #include <stdbool.h>
-#include <abi/proc/task.h>
-#include <abi/ddi/irq.h>
-#include <abi/ipc/event.h>
-#include <abi/ipc/interfaces.h>
+#include <task.h>
 
 typedef ipc_callid_t aid_t;
-typedef sysarg_t port_id_t;
 
 typedef void *(*async_client_data_ctor_t)(void);
 typedef void (*async_client_data_dtor_t)(void *);
 
-/** Port connection handler
+/** Client connection handler
  *
  * @param callid ID of incoming call or 0 if connection initiated from
- *               inside using async_create_callback_port()
+ *               inside using async_connect_to_me()
  * @param call   Incoming call or 0 if connection initiated from inside
- *               using async_create_callback_port()
- * @param arg    Local argument.
- *
- */
-typedef void (*async_port_handler_t)(ipc_callid_t, ipc_call_t *, void *);
-
-/** Notification handler */
-typedef void (*async_notification_handler_t)(ipc_callid_t, ipc_call_t *,
-    void *);
+ * @param arg    Local argument passed from async_new_connection() or
+ *               async_connect_to_me()
+ */
+typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *, void *);
+
+/** Interrupt handler */
+typedef void (*async_interrupt_handler_t)(ipc_callid_t, ipc_call_t *);
 
 /** Exchange management style
@@ -83 +77 @@
         EXCHANGE_ATOMIC = 0,
         
-        /** Exchange management via mutual exclusion
-         *
-         * Suitable for any kind of client/server communication,
-         * but can limit parallelism.
-         *
-         */
-        EXCHANGE_SERIALIZE = 1,
-        
         /** Exchange management via phone cloning
          *
@@ -98 +84 @@
          *
          */
-        EXCHANGE_PARALLEL = 2
+        EXCHANGE_PARALLEL,
+        
+        /** Exchange management via mutual exclusion
+         *
+         * Suitable for any kind of client/server communication,
+         * but can limit parallelism.
+         *
+         */
+        EXCHANGE_SERIALIZE
 } exch_mgmt_t;
 
@@ -111 +105 @@
 
 #define async_manager() \
-        do { \
-                futex_down(&async_futex); \
-                fibril_switch(FIBRIL_FROM_DEAD); \
-        } while (0)
+        fibril_switch(FIBRIL_TO_MANAGER)
 
 #define async_get_call(data) \
@@ -150 +141 @@
 extern void async_forget(aid_t);
 
+extern fid_t async_new_connection(task_id_t, sysarg_t, ipc_callid_t,
+    ipc_call_t *, async_client_conn_t, void *);
+
 extern void async_usleep(suseconds_t);
 extern void async_create_manager(void);
@@ -160 +154 @@
 extern void async_put_client_data_by_id(task_id_t);
 
-extern int async_create_port(iface_t, async_port_handler_t, void *,
-    port_id_t *);
-extern void async_set_fallback_port_handler(async_port_handler_t, void *);
-extern int async_create_callback_port(async_exch_t *, iface_t, sysarg_t,
-    sysarg_t, async_port_handler_t, void *, port_id_t *);
-
-extern int async_irq_subscribe(int, int, async_notification_handler_t, void *,
-    const irq_code_t *);
-extern int async_irq_unsubscribe(int, int);
-
-extern int async_event_subscribe(event_type_t, async_notification_handler_t,
-    void *);
-extern int async_event_task_subscribe(event_task_type_t,
-    async_notification_handler_t, void *);
-extern int async_event_unsubscribe(event_type_t);
-extern int async_event_task_unsubscribe(event_task_type_t);
-extern int async_event_unmask(event_type_t);
-extern int async_event_task_unmask(event_task_type_t);
+extern void async_set_client_connection(async_client_conn_t);
+extern void async_set_interrupt_received(async_interrupt_handler_t);
+extern void async_set_interrupt_handler_stack_size(size_t);
 
 /*
@@ -346 +325 @@
 extern async_sess_t *async_connect_me_to(exch_mgmt_t, async_exch_t *, sysarg_t,
     sysarg_t, sysarg_t);
-extern async_sess_t *async_connect_me_to_iface(async_exch_t *, iface_t,
-    sysarg_t, sysarg_t);
 extern async_sess_t *async_connect_me_to_blocking(exch_mgmt_t, async_exch_t *,
     sysarg_t, sysarg_t, sysarg_t);
-extern async_sess_t *async_connect_me_to_blocking_iface(async_exch_t *, iface_t,
-    sysarg_t, sysarg_t);
 extern async_sess_t *async_connect_kbox(task_id_t);
 
-extern int async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t);
+extern int async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t,
+    async_client_conn_t, void *);
 
 extern int async_hangup(async_sess_t *);
@@ -423 +399 @@
 extern int async_data_read_start(async_exch_t *, void *, size_t);
 extern bool async_data_read_receive(ipc_callid_t *, size_t *);
-extern bool async_data_read_receive_call(ipc_callid_t *, ipc_call_t *, size_t *);
 extern int async_data_read_finalize(ipc_callid_t, const void *, size_t);
 
@@ -462 +437 @@
 extern int async_data_write_start(async_exch_t *, const void *, size_t);
 extern bool async_data_write_receive(ipc_callid_t *, size_t *);
-extern bool async_data_write_receive_call(ipc_callid_t *, ipc_call_t *, size_t *);
 extern int async_data_write_finalize(ipc_callid_t, void *, size_t);
 
@@ -488 +462 @@
 extern void async_remote_state_release_exchange(async_exch_t *);
 
-extern void *async_as_area_create(void *, size_t, unsigned int, async_sess_t *,
-    sysarg_t, sysarg_t, sysarg_t);
-
 #endif