Changeset 1affcdf3 in mainline for uspace/srv/hid/char_mouse/chardev.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/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>
@@ -51 +53 @@
 int mouse_port_init(void)
 {
-        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;
+        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;
         }
-
-        dev_phone = fd_phone(input_fd);
+        
+        dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
         if (dev_phone < 0) {
-                printf(NAME ": Failed to connect to device\n");
-                return false;
+                printf("%s: Failed connecting to PS/2\n", NAME);
+                return ENOENT;
         }
-
+        
         /* NB: The callback connection is slotted for removal */
-        if (async_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) {
+        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return false;
         }
-
+        
         return 0;
 }
@@ -87 +87 @@
 void mouse_port_write(uint8_t data)
 {
-        async_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
+        async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
 }
 
@@ -99 +99 @@
 
                 int retval;
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        /* TODO: Handle hangup */
+                        return;
+                }
 
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        /* TODO: Handle hangup */
-                        return;
                 case IPC_FIRST_USER_METHOD:
                         mouse_handle_byte(IPC_GET_ARG1(call));