Changeset b688fd8 in mainline for uspace/lib/drv

Timestamp:

2015-08-17T18:54:56Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

abf2dfd

Parents:

b10460a

Message:

gradually introduce async ports, initial phase

The initial phase is to reimplement the traditional async client connections as an untyped fallback port. This creates the possibility to introduce ports typed by interface type gradually in later changesets.

Location:

uspace/lib/drv

Files:

• generic/driver.c (modified) (2 diffs)
• generic/private/driver.h (modified) (1 diff)
• generic/remote_audio_pcm.c (modified) (1 diff)
• generic/remote_nic.c (modified) (1 diff)
• include/audio_pcm_iface.h (modified) (1 diff)
• include/ddf/driver.h (modified) (1 diff)
• include/nic_iface.h (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -916 +916 @@
  * This allows handling connections the non-devman way.
  */
-void ddf_fun_set_conn_handler(ddf_fun_t *fun, async_client_conn_t conn)
+void ddf_fun_set_conn_handler(ddf_fun_t *fun, async_port_handler_t conn)
 {
         assert(fun->ops == NULL);
@@ -955 +955 @@
          * incoming connections.
          */
-        async_set_client_connection(driver_connection);
+        async_set_fallback_port_handler(driver_connection, NULL);
         int rc = devman_driver_register(driver->name);
         if (rc != EOK) {

uspace/lib/drv/generic/private/driver.h

@@ -96 +96 @@
         
         /** Connection handler or @c NULL to use the DDF default handler. */
-        async_client_conn_t conn_handler;
+        async_port_handler_t conn_handler;
         
         /** Link in the list of functions handled by the driver */

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -316 +316 @@
  */
 int audio_pcm_register_event_callback(audio_pcm_sess_t *sess,
-    async_client_conn_t event_callback, void *arg)
+    async_port_handler_t event_callback, void *arg)
 {
         if (!event_callback)

uspace/lib/drv/generic/remote_nic.c

@@ -126 +126 @@
  *
  */
-int nic_callback_create(async_sess_t *dev_sess, async_client_conn_t cfun,
+int nic_callback_create(async_sess_t *dev_sess, async_port_handler_t cfun,
     void *carg)
 {

uspace/lib/drv/include/audio_pcm_iface.h

@@ -85 +85 @@
 int audio_pcm_query_cap(audio_pcm_sess_t *, audio_cap_t);
 int audio_pcm_register_event_callback(audio_pcm_sess_t *,
-    async_client_conn_t, void *);
+    async_port_handler_t, void *);
 int audio_pcm_unregister_event_callback(audio_pcm_sess_t *);
 

uspace/lib/drv/include/ddf/driver.h

@@ -133 +133 @@
 extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
 extern void ddf_fun_set_ops(ddf_fun_t *, ddf_dev_ops_t *);
-extern void ddf_fun_set_conn_handler(ddf_fun_t *, async_client_conn_t);
+extern void ddf_fun_set_conn_handler(ddf_fun_t *, async_port_handler_t);
 extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);
 

uspace/lib/drv/include/nic_iface.h

@@ -48 +48 @@
 
 extern int nic_send_frame(async_sess_t *, void *, size_t);
-extern int nic_callback_create(async_sess_t *, async_client_conn_t, void *);
+extern int nic_callback_create(async_sess_t *, async_port_handler_t, void *);
 extern int nic_get_state(async_sess_t *, nic_device_state_t *);
 extern int nic_set_state(async_sess_t *, nic_device_state_t);