Changeset 3b2e387 in mainline for uspace/srv/hid/input/port/chardev_mouse.c

Timestamp:

2011-06-21T19:36:05Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e3a6c45

Parents:

40f606b (diff), 022d9f67 (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 input server, console and various other improvements

File:

• uspace/srv/hid/input/port/chardev_mouse.c (moved) (moved from uspace/srv/hid/adb_mouse/adb_dev.c ) (4 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mouse
+/** @addtogroup mouse_port
+ * @ingroup mouse
  * @{
- */ 
+ */
 /** @file
- * @brief
+ * @brief Chardev mouse port driver.
  */
 
-#include <ipc/adb.h>
+#include <ipc/char.h>
+#include <stdio.h>
 #include <async.h>
-#include <vfs/vfs.h>
-#include <fcntl.h>
 #include <errno.h>
 #include <devmap.h>
-#include <async.h>
-#include <kernel/ipc/ipc_methods.h>
+#include <input.h>
+#include <mouse_port.h>
+#include <mouse.h>
 
-#include "adb_mouse.h"
-#include "adb_dev.h"
+static mouse_dev_t *mouse_dev;
+static async_sess_t *dev_sess;
 
-static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+/** List of devices to try connecting to. */
+static const char *in_devs[] = {
+        "char/ps2b",
+};
 
-int adb_dev_init(void)
+static const unsigned int num_devs = sizeof(in_devs) / sizeof(in_devs[0]);
+
+static void mouse_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        /* Ignore parameters, the connection is already opened */
+        while (true) {
+                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 CHAR_NOTIF_BYTE:
+                        mouse_push_data(mouse_dev, IPC_GET_ARG1(call));
+                        break;
+                default:
+                        retval = ENOENT;
+                }
+                
+                async_answer_0(callid, retval);
+        }
+}
+
+static int chardev_port_init(mouse_dev_t *mdev)
 {
         devmap_handle_t handle;
-        async_exch_t *exch;
+        unsigned int i;
         int rc;
         
-        rc = devmap_device_get_handle("adb/mouse", &handle,
-            IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Failed resolving ADB\n", NAME);
-                return rc;
+        mouse_dev = mdev;
+        
+        for (i = 0; i < num_devs; i++) {
+                rc = devmap_device_get_handle(in_devs[i], &handle, 0);
+                if (rc == EOK)
+                        break;
         }
         
-        async_sess_t *dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle,
+        if (i >= num_devs) {
+                printf("%s: Could not find any suitable input device\n", NAME);
+                return -1;
+        }
+        
+        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle,
             IPC_FLAG_BLOCKING);
         if (dev_sess == NULL) {
-                printf("%s: Failed connecting to ADB\n", NAME);
+                printf("%s: Failed connecting to device\n", NAME);
                 return ENOENT;
         }
         
-        exch = async_exchange_begin(dev_sess);
+        async_exch_t *exch = async_exchange_begin(dev_sess);
         if (exch == NULL) {
-                printf("%s: Failed starting exchange with ADB\n", NAME);
+                printf("%s: Failed starting exchange with device\n", NAME);
                 async_hangup(dev_sess);
                 return ENOMEM;
@@ -76 +114 @@
         
         /* NB: The callback connection is slotted for removal */
-        rc = async_connect_to_me(exch, 0, 0, 0, adb_dev_events, NULL);
+        rc = async_connect_to_me(exch, 0, 0, 0, mouse_port_events, NULL);
         async_exchange_end(exch);
         
         if (rc != 0) {
-                printf(NAME ": Failed to create callback from device\n");
+                printf("%s: Failed to create callback from device\n", NAME);
                 async_hangup(dev_sess);
-                return ENOENT;
+                return -1;
         }
         
@@ -88 +126 @@
 }
 
-static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void chardev_port_yield(void)
 {
-        /* Ignore parameters, the connection is already opened */
-        while (true) {
+}
 
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
+static void chardev_port_reclaim(void)
+{
+}
 
-                int retval;
-                
-                if (!IPC_GET_IMETHOD(call)) {
-                        /* TODO: Handle hangup */
-                        return;
-                }
+static void chardev_port_write(uint8_t data)
+{
+        async_exch_t *exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with device\n", NAME);
+                return;
+        }
 
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_FIRST_USER_METHOD:
-                        mouse_handle_data(IPC_GET_ARG1(call));
-                        break;
-                default:
-                        retval = ENOENT;
-                }
-                async_answer_0(callid, retval);
-        }
+        async_msg_1(exch, CHAR_WRITE_BYTE, data);
+        async_exchange_end(exch);
 }
+
+mouse_port_ops_t chardev_mouse_port = {
+        .init = chardev_port_init,
+        .yield = chardev_port_yield,
+        .reclaim = chardev_port_reclaim,
+        .write = chardev_port_write
+};
 
 /**