Changeset 007e6efa in mainline for uspace/srv/hid

Timestamp:

2011-01-28T15:44:39Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4db1fbf

Parents:

ae0300b5

Message:

• libc routines for registering services and connecting to services via NS
• async_connect_to_me()

Location:

uspace/srv/hid

Files:

• console/console.c (modified) (3 diffs)
• fb/main.c (modified) (2 diffs)
• kbd/generic/kbd.c (modified) (1 diff)

uspace/srv/hid/console/console.c

@@ -40 +40 @@
 #include <ipc/fb.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <errno.h>
 #include <ipc/console.h>
@@ -762 +763 @@
         
         /* Connect to framebuffer driver */
-        fb_info.phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VIDEO, 0, 0);
+        fb_info.phone = service_connect_blocking(SERVICE_VIDEO, 0, 0);
         if (fb_info.phone < 0) {
                 printf(NAME ": Failed to connect to video service\n");
@@ -838 +839 @@
         
         /* Receive kernel notifications */
+        async_set_interrupt_received(interrupt_received);
         if (event_subscribe(EVENT_KCONSOLE, 0) != EOK)
                 printf(NAME ": Error registering kconsole notifications\n");
-        
-        async_set_interrupt_received(interrupt_received);
         
         return true;

uspace/srv/hid/fb/main.c

@@ -29 +29 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <sysinfo.h>
 #include <async.h>
@@ -114 +115 @@
                 return -1;
         
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, NULL, NULL) != 0)
+        if (service_register(SERVICE_VIDEO) != EOK)
                 return -1;
         

uspace/srv/hid/kbd/generic/kbd.c

@@ -223 +223 @@
         
         if (cir_service) {
-                while (cir_phone < 0) {
-                        cir_phone = ipc_connect_me_to_blocking(PHONE_NS, cir_service,
-                            0, 0);
-                }
+                while (cir_phone < 0)
+                        cir_phone = service_connect_blocking(cir_service, 0, 0);
         }