Changeset 6a44ee4 in mainline for uspace/srv/hid/input/port/chardev.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/input/port/chardev.c (moved) (moved from uspace/srv/hid/kbd/port/chardev.c ) (4 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +30 @@
  * @ingroup kbd
  * @{
- */ 
+ */
 /** @file
  * @brief Chardev keyboard port driver.
@@ -37 +37 @@
 #include <ipc/char.h>
 #include <async.h>
+#include <input.h>
 #include <kbd_port.h>
 #include <kbd.h>
-#include <vfs/vfs.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include <devmap.h>
 #include <errno.h>
+#include <stdio.h>
 
-static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall);
+static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
-static int dev_phone;
+static int chardev_port_init(kbd_dev_t *);
+static void chardev_port_yield(void);
+static void chardev_port_reclaim(void);
+static void chardev_port_write(uint8_t data);
 
-#define NAME "kbd"
+kbd_port_ops_t chardev_port = {
+        .init = chardev_port_init,
+        .yield = chardev_port_yield,
+        .reclaim = chardev_port_reclaim,
+        .write = chardev_port_write
+};
+
+static kbd_dev_t *kbd_dev;
+static async_sess_t *dev_sess;
 
 /** 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)
+static int chardev_port_init(kbd_dev_t *kdev)
 {
-        int input_fd;
-        int i;
-
-        input_fd = -1;
+        devmap_handle_t handle;
+        async_exch_t *exch;
+        unsigned int i;
+        int rc;
+        
+        kbd_dev = kdev;
+        
         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);
+        
+        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle,
+            IPC_FLAG_BLOCKING);
+        if (dev_sess == NULL) {
+                printf("%s: Failed connecting to device\n", NAME);
+                return ENOENT;
+        }
+        
+        exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with device\n", NAME);
+                async_hangup(dev_sess);
+                return ENOMEM;
+        }
+        
+        /* NB: The callback connection is slotted for removal */
+        rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
+        async_exchange_end(exch);
+        
+        if (rc != 0) {
+                printf("%s: Failed to create callback from device\n", NAME);
+                async_hangup(dev_sess);
                 return -1;
         }
-
-        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) {
-                printf(NAME ": Failed to create callback from device\n");
-                return -1;
-        }
-
+        
         return 0;
 }
 
-void kbd_port_yield(void)
+static void chardev_port_yield(void)
 {
 }
 
-void kbd_port_reclaim(void)
+static void chardev_port_reclaim(void)
 {
 }
 
-void kbd_port_write(uint8_t data)
+static void chardev_port_write(uint8_t data)
 {
-        async_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
+        async_exch_t *exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with device\n", NAME);
+                return;
+        }
+
+        async_msg_1(exch, CHAR_WRITE_BYTE, data);
+        async_exchange_end(exch);
 }
 
-static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall)
+static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         /* Ignore parameters, the connection is already opened */
@@ -118 +143 @@
                 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));
+                        kbd_push_data(kbd_dev, IPC_GET_ARG1(call));
                         break;
                 default: