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

uspace/srv/hid/fb/main.c

@@ -27 +27 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <sysinfo.h>
 #include <async.h>
@@ -51 +51 @@
         
         dest = as_get_mappable_page(IPC_GET_ARG2(*call));
-        if (ipc_answer_1(callid, EOK, (sysarg_t) dest) == 0) {
+        if (async_answer_1(callid, EOK, (sysarg_t) dest) == 0) {
                 if (*area)
                         as_area_destroy(*area);
@@ -114 +114 @@
                 return -1;
         
-        ipcarg_t phonead;
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0) 
+        if (service_register(SERVICE_VIDEO) != EOK)
                 return -1;