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

uspace/srv/hid/isdv4_tablet/main.c

@@ -69 +69 @@
         async_sess_t *sess =
             async_callback_receive(EXCHANGE_SERIALIZE);
+        
         fibril_mutex_lock(&client_mutex);
-                if (client_sess == NULL) {
-                        client_sess = sess;
-                }
+        
+        if (client_sess == NULL)
+                client_sess = sess;
+        
         fibril_mutex_unlock(&client_mutex);
 
@@ -262 +264 @@
         printf(NAME ": Using serial port %s\n", serial_port_name);
 
-        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
+        async_sess_t *sess = loc_service_connect(svc_id, INTERFACE_DDF,
             IPC_FLAG_BLOCKING);
         if (!sess) {
@@ -306 +308 @@
         fibril_add_ready(fibril);
 
-        async_set_client_connection(mouse_connection);
+        async_set_fallback_port_handler(mouse_connection, NULL);
         rc = loc_server_register(NAME);
         if (rc != EOK) {