Changeset 41811af in mainline for uspace/srv/hid/kbd/port/chardev.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/srv/hid/kbd/port/chardev.c (modified) (5 diffs)

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

@@ -30 +30 @@
  * @ingroup kbd
  * @{
- */ 
+ */
 /** @file
  * @brief Chardev keyboard port driver.
@@ -37 +37 @@
 #include <ipc/char.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <kbd_port.h>
 #include <kbd.h>
-#include <vfs/vfs.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include <devmap.h>
+#include <devmap_obsolete.h>
 #include <errno.h>
+#include <stdio.h>
+
+#define NAME  "kbd/chardev"
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall);
@@ -48 +51 @@
 static int dev_phone;
 
-#define NAME "kbd"
-
 /** List of devices to try connecting to. */
 static const char *in_devs[] = {
-        "/dev/char/ps2a",
-        "/dev/char/s3c24ser"
+        "char/ps2a",
+        "char/s3c24ser"
 };
 
-static const int num_devs = sizeof(in_devs) / sizeof(in_devs[0]);
+static const unsigned int num_devs = sizeof(in_devs) / sizeof(in_devs[0]);
 
 int kbd_port_init(void)
 {
-        int input_fd;
-        int i;
-
-        input_fd = -1;
+        devmap_handle_t handle;
+        unsigned int i;
+        int rc;
+        
         for (i = 0; i < num_devs; i++) {
-                struct stat s;
-
-                if (stat(in_devs[i], &s) == EOK)
+                rc = devmap_device_get_handle(in_devs[i], &handle, 0);
+                if (rc == EOK)
                         break;
         }
-
+        
         if (i >= num_devs) {
-                printf(NAME ": Could not find any suitable input device.\n");
+                printf("%s: Could not find any suitable input device\n", NAME);
                 return -1;
         }
-
-        input_fd = open(in_devs[i], O_RDONLY);
-        if (input_fd < 0) {
-                printf(NAME ": failed opening device %s (%d).\n", in_devs[i],
-                    input_fd);
-                return -1;
+        
+        dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
+        if (dev_phone < 0) {
+                printf("%s: Failed connecting to device\n", NAME);
+                return ENOENT;
         }
-
-        dev_phone = fd_phone(input_fd);
-        if (dev_phone < 0) {
-                printf(NAME ": Failed connecting to device\n");
-                return -1;
-        }
-
+        
         /* NB: The callback connection is slotted for removal */
-        if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) {
+        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return -1;
@@ -108 +101 @@
 void kbd_port_write(uint8_t data)
 {
-        async_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
+        async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
 }
 
@@ -118 +111 @@
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        /* TODO: Handle hangup */
+                        return;
+                }
 
                 int retval;
 
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        /* TODO: Handle hangup */
-                        return;
                 case CHAR_NOTIF_BYTE:
                         kbd_push_scancode(IPC_GET_ARG1(call));