Changes in uspace/srv/hid/char_mouse/chardev.c [9934f7d:ffa2c8ef] in mainline

File:

• uspace/srv/hid/char_mouse/chardev.c (modified) (4 diffs)

uspace/srv/hid/char_mouse/chardev.c

@@ -36 +36 @@
 #include <ipc/char.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <vfs/vfs.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <devmap.h>
-#include <devmap_obsolete.h>
+
 #include <char_mouse.h>
 #include <mouse_port.h>
 
-static void chardev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static void chardev_events(ipc_callid_t iid, ipc_call_t *icall);
 
 static int dev_phone;
@@ -53 +51 @@
 int mouse_port_init(void)
 {
-        devmap_handle_t handle;
-        int rc = devmap_device_get_handle("char/ps2b", &handle,
-            IPC_FLAG_BLOCKING);
-        
-        if (rc != EOK) {
-                printf("%s: Failed resolving PS/2\n", NAME);
-                return rc;
+        const char *input = "/dev/char/ps2b";
+        int input_fd;
+
+        printf(NAME ": open %s\n", input);
+
+        input_fd = open(input, O_RDONLY);
+        if (input_fd < 0) {
+                printf(NAME ": Failed opening %s (%d)\n", input, input_fd);
+                return false;
         }
-        
-        dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
+
+        dev_phone = fd_phone(input_fd);
         if (dev_phone < 0) {
-                printf("%s: Failed connecting to PS/2\n", NAME);
-                return ENOENT;
+                printf(NAME ": Failed to connect to device\n");
+                return false;
         }
-        
+
         /* NB: The callback connection is slotted for removal */
-        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, chardev_events,
-            NULL) != 0) {
+        if (async_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return false;
         }
-        
+
         return 0;
 }
@@ -88 +87 @@
 void mouse_port_write(uint8_t data)
 {
-        async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
+        async_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
 }
 
-static void chardev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void chardev_events(ipc_callid_t iid, ipc_call_t *icall)
 {
         /* Ignore parameters, the connection is already opened */
@@ -100 +99 @@
 
                 int retval;
-                
-                if (!IPC_GET_IMETHOD(call)) {
+
+                switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
                         return;
-                }
-
-                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_FIRST_USER_METHOD:
                         mouse_handle_byte(IPC_GET_ARG1(call));