Changeset ff381a7 in mainline for uspace/lib/drv/generic/remote_audio_pcm.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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.

File:

• uspace/lib/drv/generic/remote_audio_pcm.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -146 +146 @@
         if (ret != EOK)
                 return NULL;
-        return devman_device_connect(EXCHANGE_SERIALIZE, device_handle,
-            IPC_FLAG_BLOCKING);
+        return devman_device_connect(device_handle, IPC_FLAG_BLOCKING);
 }
 
@@ -158 +157 @@
 audio_pcm_sess_t *audio_pcm_open_service(service_id_t id)
 {
-        return loc_service_connect(EXCHANGE_SERIALIZE, id, IPC_FLAG_BLOCKING);
+        return loc_service_connect(id, INTERFACE_DDF, IPC_FLAG_BLOCKING);
 }
 
@@ -316 +315 @@
  */
 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)
@@ -322 +321 @@
 
         async_exch_t *exch = async_exchange_begin(sess);
+        
         int ret = async_req_1_0(exch, DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
             IPC_M_AUDIO_PCM_REGISTER_EVENTS);
         if (ret == EOK) {
-                ret = async_connect_to_me(exch, 0, 0, 0, event_callback, arg);
-        }
+                port_id_t port;
+                ret = async_create_callback_port(exch, INTERFACE_AUDIO_PCM_CB, 0, 0,
+                    event_callback, arg, &port);
+        }
+        
         async_exchange_end(exch);
         return ret;