Changeset ff381a7 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2015-11-02T20:54:19Z (9 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/console/console.c (modified) (4 diffs)

uspace/srv/hid/console/console.c

@@ -508 +508 @@
         
         for (size_t i = 0; i < CONSOLE_COUNT; i++) {
-                if (consoles[i].dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
+                if (consoles[i].dsid == (service_id_t) IPC_GET_ARG2(*icall)) {
                         cons = &consoles[i];
                         break;
@@ -536 +536 @@
         }
 
-        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,
@@ -561 +561 @@
         int rc = loc_service_get_id(svc, &dsid, 0);
         if (rc == EOK) {
-                sess = loc_service_connect(EXCHANGE_SERIALIZE, dsid, 0);
+                sess = loc_service_connect(dsid, INTERFACE_OUTPUT, 0);
                 if (sess == NULL) {
                         printf("%s: Unable to connect to output service %s\n",
@@ -586 +586 @@
         
         /* Register server */
-        async_set_client_connection(client_connection);
+        async_set_fallback_port_handler(client_connection, NULL);
         rc = loc_server_register(NAME);
         if (rc != EOK) {