Changeset cf2af94 in mainline for uspace/srv/hid/kbd/port/adb.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/srv/hid/kbd/port/adb.c (modified) (4 diffs)

uspace/srv/hid/kbd/port/adb.c

@@ -35 +35 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/adb.h>
 #include <async.h>
@@ -71 +70 @@
 
         /* NB: The callback connection is slotted for removal */
-        ipcarg_t phonehash;
-        if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) {
+        if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return false;
         }
-
-        async_new_connection(phonehash, 0, NULL, kbd_port_events);
 
         return 0;
@@ -105 +101 @@
                 int retval;
 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
@@ -115 +111 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }