Changeset 17857 in vbox for trunk/src/VBox/Additions/linux/module/vboxmod.c

Timestamp:

Mar 13, 2009 7:29:11 PM (16 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxadd: added vboxuser device to kernel module for use by OpenGL guest additions

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (9 diffs)

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

@@ -666 +666 @@
 
 /**
- * IOCTL handler
- *
+ * IOCTL handler for vboxadd
  */
 static int vboxadd_ioctl(struct inode *inode, struct file *filp,
@@ -852 +851 @@
 
 /**
+ * IOCTL handler for vboxuser
+ */
+static int vboxuser_ioctl(struct inode *inode, struct file *filp,
+                          unsigned int cmd, unsigned long arg)
+{
+        int rc = 0;
+
+        /* Deal with variable size ioctls first. */
+        if (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0))
+                 == VBOXGUEST_IOCTL_STRIP_SIZE(cmd))
+        {
+        /* Do the HGCM call using the Vbgl bits */
+                IOCTL_ENTRY("VBOXGUEST_IOCTL_HGCM_CALL", arg);
+                rc = vboxadd_hgcm_call(arg, _IOC_SIZE(cmd));
+                IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_CALL", arg);
+        }
+        else if (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_TIMED(0))
+                 == VBOXGUEST_IOCTL_STRIP_SIZE(cmd))
+        {
+        /* Do the HGCM call using the Vbgl bits */
+                IOCTL_ENTRY("VBOXGUEST_IOCTL_HGCM_CALL_TIMED", arg);
+                rc = vboxadd_hgcm_call_timed(arg, _IOC_SIZE(cmd));
+                IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_CALL_TIMED", arg);
+        }
+        else
+        {
+            switch (cmd) {
+            case VBOXGUEST_IOCTL_HGCM_CONNECT:
+                    IOCTL_ENTRY("VBOXGUEST_IOCTL_HGCM_CONNECT", arg);
+                    rc = vboxadd_hgcm_connect(filp, arg);
+                    IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_CONNECT", arg);
+                    break;
+            case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
+                    IOCTL_ENTRY("VBOXGUEST_IOCTL_HGCM_DISCONNECT", arg);
+                    vboxadd_hgcm_disconnect(filp, arg);
+                    IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_DISCONNECT", arg);
+                    break;
+            default:
+                    LogRelFunc(("unknown command: %x\n", cmd));
+                    rc = -EINVAL;
+                    break;
+            }
+        }
+        return rc;
+}
+
+/**
  * 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
@@ -890 +936 @@
 
 /**
- * File close handler.  Clean up any HGCM connections associated with the open file
- * which might still be open.
+ * File close handler for vboxadd.  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)
@@ -898 +944 @@
         /* Deactivate our asynchronous queue. */
         vboxadd_fasync(-1, filp, 0);
+        return 0;
+}
+
+/**
+ * File close handler for vboxuser.  Clean up any HGCM connections associated
+ * with the open file which might still be open.
+ */
+static int vboxuser_release(struct inode *inode, struct file * filp)
+{
+        vboxadd_unregister_all_hgcm_connections(filp);
         return 0;
 }
@@ -920 +976 @@
     name:       VBOXADD_NAME,
     fops:       &vboxadd_fops
+};
+
+/** file operations for the vboxuser device */
+static struct file_operations vboxuser_fops =
+{
+    .owner   = THIS_MODULE,
+    .open    = vboxadd_open,
+    .ioctl   = vboxuser_ioctl,
+    .release = vboxuser_release,
+    .llseek  = no_llseek
+};
+
+/** Miscellaneous device allocation for vboxuser */
+static struct miscdevice gMiscVBoxUser =
+{
+    minor:      MISC_DYNAMIC_MINOR,
+    name:       VBOXUSER_NAME,
+    fops:       &vboxuser_fops
 };
 
@@ -1171 +1245 @@
 {
     int rc = 0, rcVBox = VINF_SUCCESS;
-    bool haveVBoxAdd = false, haveGuestLib = false;
+    bool haveVBoxAdd = false, haveVBoxUser = false, haveGuestLib = false;
     struct pci_dev *pcidev = NULL;
 
@@ -1219 +1293 @@
     if (!rc)
         haveVBoxAdd = true;
+
+    /* Register our user session device */
+    if (!rc) {
+        rc = misc_register(&gMiscVBoxUser);
+        if (rc)
+            LogRel(("vboxadd: misc_register failed for %s (rc=%d)\n",
+                    VBOXUSER_NAME, rc));
+    }
+    if (!rc)
+        haveVBoxUser = true;
 
     /* allocate and initialize device extension */
@@ -1428 +1512 @@
         if (vboxDev)
             free_resources();
+        if (haveVBoxUser)
+            misc_deregister(&gMiscVBoxUser);
         if (haveVBoxAdd && vbox_major > 0)
             unregister_chrdev(vbox_major, VBOXADD_NAME);
@@ -1446 +1532 @@
 static __exit void fini(void)
 {
+    misc_deregister(&gMiscVBoxUser);
     if (vbox_major > 0)
         unregister_chrdev(vbox_major, VBOXADD_NAME);