Changeset 89c57b6 in mainline for uspace/srv/hid/kbd/port/chardev.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/kbd/port/chardev.c (modified) (5 diffs)

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

@@ -35 +35 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/char.h>
 #include <async.h>
@@ -41 +40 @@
 #include <kbd.h>
 #include <vfs/vfs.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -50 +50 @@
 #define NAME "kbd"
 
+/** List of devices to try connecting to. */
+static const char *in_devs[] = {
+        "/dev/char/ps2a",
+        "/dev/char/s3c24ser"
+};
+
+static const int num_devs = sizeof(in_devs) / sizeof(in_devs[0]);
+
 int kbd_port_init(void)
 {
-        const char *input = "/dev/char/ps2a";
         int input_fd;
+        int i;
 
-        printf(NAME ": open %s\n", input);
+        input_fd = -1;
+        for (i = 0; i < num_devs; i++) {
+                struct stat s;
 
-        input_fd = open(input, O_RDONLY);
+                if (stat(in_devs[i], &s) == EOK)
+                        break;
+        }
+
+        if (i >= num_devs) {
+                printf(NAME ": Could not find any suitable input device.\n");
+                return -1;
+        }
+
+        input_fd = open(in_devs[i], O_RDONLY);
         if (input_fd < 0) {
-                printf(NAME ": Failed opening %s (%d)\n", input, input_fd);
-                return false;
+                printf(NAME ": failed opening device %s (%d).\n", in_devs[i],
+                    input_fd);
+                return -1;
         }
 
         dev_phone = fd_phone(input_fd);
         if (dev_phone < 0) {
-                printf(NAME ": Failed to connect to device\n");
-                return false;
+                printf(NAME ": Failed connecting to device\n");
+                return -1;
         }
 
         /* NB: The callback connection is slotted for removal */
-        ipcarg_t phonehash;
-        if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) {
+        if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
-                return false;
+                return -1;
         }
-
-        async_new_connection(phonehash, 0, NULL, kbd_port_events);
 
         return 0;
@@ -104 +121 @@
                 int retval;
 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
@@ -114 +131 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }