Changeset 2b96463 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2011-01-28T15:15:11Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3ee48f2, 7a51d75

Parents:

ef8d655 (diff), ae0300b5 (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) (6 diffs)

uspace/srv/hid/console/console.c

@@ -727 +727 @@
         /* NB: The callback connection is slotted for removal */
         sysarg_t phonehash;
+        sysarg_t taskhash;
         int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, SERVICE_CONSOLE,
-            0, 0, NULL, NULL, NULL, NULL, &phonehash);
+            0, 0, NULL, NULL, NULL, &taskhash, &phonehash);
         if (rc != EOK) {
                 printf(NAME ": Failed to create callback from input device\n");
@@ -734 +735 @@
         }
         
-        async_new_connection(phonehash, 0, NULL, keyboard_events);
+        async_new_connection(taskhash, phonehash, 0, NULL, keyboard_events);
 
         printf(NAME ": we got a hit (new keyboard \"%s\").\n", path);
@@ -784 +785 @@
         /* NB: The callback connection is slotted for removal */
         sysarg_t phonehash;
+        sysarg_t taskhash;
         int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, SERVICE_CONSOLE,
-            0, 0, NULL, NULL, NULL, NULL, &phonehash);
+            0, 0, NULL, NULL, NULL, &taskhash, &phonehash);
         if (rc != EOK) {
                 printf(NAME ": Failed to create callback from input device\n");
@@ -791 +793 @@
         }
 
-        async_new_connection(phonehash, 0, NULL, keyboard_events);
+        async_new_connection(taskhash, phonehash, 0, NULL, keyboard_events);
 
         printf(NAME ": we got a hit (new keyboard \"/dev/%s\").\n",
@@ -862 +864 @@
         }
         
+        sysarg_t taskhash;
         sysarg_t phonehash;
-        if (ipc_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
+        if (ipc_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, &taskhash,
+            &phonehash) != 0) {
                 printf(NAME ": Failed to create callback from mouse device\n");
                 mouse_phone = -1;
@@ -869 +873 @@
         }
         
-        async_new_connection(phonehash, 0, NULL, mouse_events);
+        async_new_connection(taskhash, phonehash, 0, NULL, mouse_events);
 skip_mouse: