Changeset 1875a0c in mainline for uspace/srv/hid/input/proto/mousedev.c

Timestamp:

2011-06-21T19:10:20Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

022d9f67

Parents:

a9d85df

Message:

input server improvements

• integrate legacy port mouse drivers (PS/2, ADB) into the input server (to be on par with the legacy keyboard drivers)
• create generic port/protocol layers for the mouse in the input server
• rename the "hid_in" namespace to "hid" namespace (hid_in/input was rather redundant)
• rename the mouse event IPC messages to be more consistent with the keyboard event messages
• rename input server ops structure members to be more generic (parse_scancode → parse)
• cstyle changes (newlines, comments, printouts)

File:

• uspace/srv/hid/input/proto/mousedev.c (moved) (moved from uspace/srv/hid/input/generic/mouse.c ) (3 diffs)

uspace/srv/hid/input/proto/mousedev.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/**
- * @addtogroup inputgen generic
- * @brief Mouse device handling.
+/** @addtogroup mouse_proto
  * @ingroup input
  * @{
  */
-/** @file
+/**
+ * @file
+ * @brief Mouse device connector controller driver.
  */
 
-#include <adt/list.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <vfs/vfs_sess.h>
+#include <malloc.h>
 #include <async.h>
 #include <errno.h>
-#include <fcntl.h>
+#include <ipc/mouseev.h>
 #include <input.h>
-#include <ipc/mouse.h>
 #include <mouse.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <vfs/vfs_sess.h>
+#include <mouse_port.h>
+#include <mouse_proto.h>
 
-static void mouse_callback_conn(ipc_callid_t, ipc_call_t *, void *);
+/** Mousedev softstate */
+typedef struct {
+        /** Link to generic mouse device */
+        mouse_dev_t *mouse_dev;
+        
+        /** Session to mouse device */
+        async_sess_t *sess;
+        
+        /** File descriptor of open mousedev device */
+        int fd;
+} mousedev_t;
 
-static mouse_dev_t *mouse_dev_new(void)
+static mousedev_t *mousedev_new(mouse_dev_t *mdev)
 {
-        mouse_dev_t *mdev;
-
-        mdev = calloc(1, sizeof(mouse_dev_t));
-        if (mdev == NULL) {
-                printf(NAME ": Error allocating mouse device. "
-                    "Out of memory.\n");
+        mousedev_t *mousedev = calloc(1, sizeof(mousedev_t));
+        if (mousedev == NULL)
                 return NULL;
-        }
-
-        link_initialize(&mdev->mouse_devs);
-        return mdev;
+        
+        mousedev->mouse_dev = mdev;
+        mousedev->fd = -1;
+        
+        return mousedev;
 }
 
-static int mouse_dev_connect(mouse_dev_t *mdev, const char *dev_path)
+static void mousedev_destroy(mousedev_t *mousedev)
 {
-        async_sess_t *sess;
-        async_exch_t *exch;
-        int fd;
-        int rc;
-
-        fd = open(dev_path, O_RDWR);
-        if (fd < 0) {
-                return -1;
-        }
-
-        sess = fd_session(EXCHANGE_SERIALIZE, fd);
-        if (sess == NULL) {
-                printf(NAME ": Failed starting session with '%s'\n", dev_path);
-                close(fd);
-                return -1;
-        }
-
-        exch = async_exchange_begin(sess);
-        if (exch == NULL) {
-                printf(NAME ": Failed starting exchange with '%s'.\n", dev_path);
-                return -1;
-        }
-
-        rc = async_connect_to_me(exch, 0, 0, 0, mouse_callback_conn, mdev);
-        if (rc != EOK) {
-                printf(NAME ": Failed creating callback connection from '%s'.\n",
-                    dev_path);
-                async_exchange_end(exch);
-                return -1;
-        }
-
-        async_exchange_end(exch);
-
-        mdev->dev_path = dev_path;
-        return 0;
+        if (mousedev->sess != NULL)
+                async_hangup(mousedev->sess);
+        
+        if (mousedev->fd >= 0)
+                close(mousedev->fd);
+        
+        free(mousedev);
 }
 
-/** Add new mouse device.
- *
- * @param dev_path      Filesystem path to the device (/dev/class/...)
- */
-int mouse_add_dev(const char *dev_path)
+static void mousedev_callback_conn(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
-        mouse_dev_t *mdev;
-        int rc;
-
-        mdev = mouse_dev_new();
-        if (mdev == NULL)
-                return -1;
-
-        rc = mouse_dev_connect(mdev, dev_path);
-        if (rc != EOK) {
-                free(mdev);
-                return -1;
-        }
-
-        list_append(&mdev->mouse_devs, &mouse_devs);
-        return EOK;
-}
-
-/** Mouse device callback connection handler. */
-static void mouse_callback_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-        int retval;
-
+        /* Mousedev device structure */
+        mousedev_t *mousedev = (mousedev_t *) arg;
+        
         while (true) {
                 ipc_call_t call;
-                ipc_callid_t callid;
-
-                callid = async_get_call(&call);
+                ipc_callid_t callid = async_get_call(&call);
+                
                 if (!IPC_GET_IMETHOD(call)) {
                         /* XXX Handle hangup */
                         return;
                 }
-
+                
+                int retval;
+                
                 switch (IPC_GET_IMETHOD(call)) {
-                case MEVENT_BUTTON:
-                        input_event_button(IPC_GET_ARG1(call),
+                case MOUSEEV_MOVE_EVENT:
+                        mouse_push_event_move(mousedev->mouse_dev, IPC_GET_ARG1(call),
                             IPC_GET_ARG2(call));
-                        retval = 0;
+                        retval = EOK;
                         break;
-                case MEVENT_MOVE:
-                        input_event_move(IPC_GET_ARG1(call),
+                case MOUSEEV_BUTTON_EVENT:
+                        mouse_push_event_button(mousedev->mouse_dev, IPC_GET_ARG1(call),
                             IPC_GET_ARG2(call));
-                        retval = 0;
+                        retval = EOK;
                         break;
                 default:
@@ -156 +115 @@
                         break;
                 }
-
+                
                 async_answer_0(callid, retval);
         }
 }
 
+static int mousedev_proto_init(mouse_dev_t *mdev)
+{
+        const char *pathname = mdev->dev_path;
+        
+        int fd = open(pathname, O_RDWR);
+        if (fd < 0)
+                return -1;
+        
+        async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd);
+        if (sess == NULL) {
+                printf("%s: Failed starting session with '%s'\n", NAME, pathname);
+                close(fd);
+                return -1;
+        }
+        
+        mousedev_t *mousedev = mousedev_new(mdev);
+        if (mousedev == NULL) {
+                printf("%s: Failed allocating device structure for '%s'.\n",
+                    NAME, pathname);
+                return -1;
+        }
+        
+        mousedev->fd = fd;
+        mousedev->sess = sess;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with '%s'.\n", NAME, pathname);
+                mousedev_destroy(mousedev);
+                return -1;
+        }
+        
+        int rc = async_connect_to_me(exch, 0, 0, 0, mousedev_callback_conn, mousedev);
+        async_exchange_end(exch);
+        
+        if (rc != EOK) {
+                printf("%s: Failed creating callback connection from '%s'.\n",
+                    NAME, pathname);
+                mousedev_destroy(mousedev);
+                return -1;
+        }
+        
+        return 0;
+}
+
+mouse_proto_ops_t mousedev_proto = {
+        .init = mousedev_proto_init
+};
+
 /**
  * @}