儲存庫 vbox 的更動 12280

時間撮記:

2008-9-9 上午10:07:14 (16 年 以前)

作者:

vboxsync

訊息:

Additions/linux: added support for polling /dev/vboxadd for mouse movement in absolute mode

位置:

trunk/src/VBox/Additions/linux/module

檔案:

• vboxmod.c (修改) (8 筆差異)
• vboxmod.h (修改) (1 筆差異)

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -73 +73 @@
 #include <iprt/assert.h>
 #include <linux/miscdevice.h>
+#include <linux/poll.h>
 
 #define xstr(s) str(s)
@@ -206 +207 @@
 }
 
-
 /**
  * File open handler
@@ -215 +215 @@
     /* no checks required */
     return 0;
-}
-
-/**
- * File close handler.  Clean up any HGCM connections associated with the open file
- * which might still be open.
- */
-static int vboxadd_release(struct inode *inode, struct file * filp)
-{
-        vboxadd_unregister_all_hgcm_connections(filp);
-        return 0;
 }
 
@@ -585 +575 @@
 }
 
-#ifdef DEBUG
+/**
+ * Poll function.  This returns "ready to read" if the guest is in absolute
+ * mouse pointer mode and the pointer position has changed since the last
+ * poll.
+ */
+unsigned int
+vboxadd_poll (struct file *file, poll_table *wait)
+{
+    int result = 0;
+    poll_wait(file, &vboxDev->eventq, wait);
+    if (vboxDev->u32Events & VMMDEV_EVENT_MOUSE_POSITION_CHANGED)
+        result = (POLLIN | POLLRDNORM);
+    vboxDev->u32Events &= ~VMMDEV_EVENT_MOUSE_POSITION_CHANGED;
+    return result;
+}
+
+/** Asynchronous notification activation method. */
+static int
+vboxadd_fasync(int fd, struct file *file, int mode)
+{
+    return fasync_helper(fd, file, mode, &vboxDev->async_queue);
+}
+
+/**
+ * Dummy read function - we only supply this because we implement poll and 
+ * fasync.
+ */
 static ssize_t
 vboxadd_read (struct file *file, char *buf, size_t count, loff_t *loff)
 {
-    if (count != 8 || *loff != 0)
+    if (0 == count || *loff != 0)
     {
         return -EINVAL;
     }
-    *(uint32_t *) buf = vboxDev->pVMMDevMemory->V.V1_04.fHaveEvents;
-    *(uint32_t *) (buf + 4) = vboxDev->u32Events;
-    *loff += 8;
-    return 8;
-}
-#endif
+    buf[0] = 0;
+    return 1;
+}
+
+/**
+ * File close handler.  Clean up any HGCM connections associated with the open file
+ * which might still be open.
+ */
+static int vboxadd_release(struct inode *inode, struct file * filp)
+{
+        vboxadd_unregister_all_hgcm_connections(filp);
+        /* Deactivate our asynchronous queue. */
+        vboxadd_fasync(-1, filp, 0);
+        return 0;
+}
 
 /** strategy handlers (file operations) */
@@ -605 +630 @@
     .owner   = THIS_MODULE,
     .open    = vboxadd_open,
+    .ioctl   = vboxadd_ioctl,
+    .poll    = vboxadd_poll,
+    .fasync  = vboxadd_fasync,
+    .read    = vboxadd_read,
     .release = vboxadd_release,
-    .ioctl   = vboxadd_ioctl,
-#ifdef DEBUG
-    .read    = vboxadd_read,
-#endif
     .llseek  = no_llseek
 };
@@ -666 +691 @@
             {
                 vboxDev->u32Events |= vboxDev->irqAckRequest->events;
+                if (  vboxDev->irqAckRequest->events
+                    & VMMDEV_EVENT_MOUSE_POSITION_CHANGED)
+                    kill_fasync(&vboxDev->async_queue, SIGIO, POLL_IN);
                 wake_up (&vboxDev->eventq);
             }
@@ -824 +852 @@
     if (vboxDev)
     {
-        /* at first detach from IRQ! */
+        {
+            /* Unregister notifications when the host absolute pointer
+             * position changes. */
+            VBoxGuestFilterMaskInfo info;
+            info.u32OrMask = 0;
+            info.u32NotMask = VMMDEV_EVENT_MOUSE_POSITION_CHANGED;
+            vboxadd_control_filter_mask(&info);
+        }
+        /* Detach from IRQ before cleaning up! */
         if (vboxDev->irq)
             free_irq(vboxDev->irq, vboxDev);
@@ -1061 +1097 @@
 
     init_waitqueue_head (&vboxDev->eventq);
+
+    {
+        /* Register for notification when the host absolute pointer position
+         * changes. */
+        VBoxGuestFilterMaskInfo info;
+        info.u32OrMask = VMMDEV_EVENT_MOUSE_POSITION_CHANGED;
+        info.u32NotMask = 0;
+        rcVBox = vboxadd_control_filter_mask(&info);
+        if (!RT_SUCCESS(rcVBox))
+        {
+            LogRelFunc(("failed to register for VMMDEV_EVENT_MOUSE_POSITION_CHANGED events\n"));
+            err = -RTErrConvertToErrno(rcVBox);
+            goto fail;
+        }
+    }
 
     /* some useful information for the user but don't show this on the console */

trunk/src/VBox/Additions/linux/module/vboxmod.h

@@ -59 +59 @@
         event. */
     uint32_t u32GuestInterruptions;
+    /** Queue structure */
+    struct fasync_struct *async_queue;
 };