Changeset ff381a7 in mainline for uspace/srv/hid/compositor/compositor.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/srv/hid/compositor/compositor.c (modified) (5 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -896 +896 @@
         ipc_call_t call;
         ipc_callid_t callid;
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*icall);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG2(*icall);
 
         /* Allocate resources for new window and register it to the location service. */
@@ -1175 +1175 @@
         async_sess_t *sess;
 
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
+        sess = loc_service_connect(sid, INTERFACE_DDF, 0);
         if (sess == NULL) {
                 printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
@@ -1182 +1182 @@
 
         async_exch_t *exch = async_exchange_begin(sess);
-        rc = async_connect_to_me(exch, sid, 0, 0, vsl_notifications, NULL);
+        
+        port_id_t port;
+        rc = async_create_callback_port(exch, INTERFACE_VISUALIZER_CB, 0, 0,
+            vsl_notifications, NULL, &port);
+        
         async_exchange_end(exch);
 
@@ -2145 +2149 @@
         }
 
-        sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0);
+        sess = loc_service_connect(dsid, INTERFACE_INPUT, 0);
         if (sess == NULL) {
                 printf("%s: Unable to connect to input service %s\n", NAME,
@@ -2240 +2244 @@
         
         /* Register compositor server. */
-        async_set_client_connection(client_connection);
+        async_set_fallback_port_handler(client_connection, NULL);
         
         int rc = loc_server_register(NAME);