Changeset 18688 in vbox for trunk/src

Timestamp:

Apr 3, 2009 1:13:34 PM (16 years ago)

Author:

vboxsync

Message:

VBoxMouse/win: Added mouse detection for interrupt 12h (ACPI enabled VMs).

File:

• trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp

@@ -186 +186 @@
         if (status == STATUS_SUCCESS)
         {
-            /* Check whether the device claims the IO port 0x60. */
-            BOOLEAN bPort60h = FALSE;
+            /* Check whether the device claims the IO port 0x60 or interrupt 12. */
+            BOOLEAN bDetected = FALSE;
 
             CM_RESOURCE_LIST *pResourceList = (CM_RESOURCE_LIST *)&Property[0];
 
-            dprintf(("VBoxMouse::vboxDeviceAdded: Configuration: descriptors %d\n",
+            dprintf(("VBoxMouse::vboxDeviceAdded: Configuration: Number of descriptors = %d\n",
                       pResourceList->Count));
 
@@ -217 +217 @@
                              pPartialDescriptor->u.Generic.Start.QuadPart, pPartialDescriptor->u.Generic.Length));
 
-                    if (pPartialDescriptor->Type == CmResourceTypePort)
+                    switch(pPartialDescriptor->Type)
                     {
+
+                    case CmResourceTypePort:
+
+                        dprintf(("VBoxMouse::vboxDeviceAdded: PartialDescriptor %d: Port 0x%x\n", iPartialDescriptor, pPartialDescriptor->u.Port.Start.QuadPart));
                         if (pPartialDescriptor->u.Port.Start.QuadPart == 0x60)
                         {
-                            bPort60h = TRUE;
+                            bDetected = TRUE;
                         }
+                        break;
+
+                    case CmResourceTypeInterrupt:
+
+                        dprintf(("VBoxMouse::vboxDeviceAdded: PartialDescriptor %d: Int %ld\n", iPartialDescriptor, pPartialDescriptor->u.Interrupt.Vector));
+                        if (pPartialDescriptor->u.Interrupt.Vector == 0x12)
+                        {
+                            bDetected = TRUE;
+                        }
+                        break;
+
+                    default:
+                        break;
                     }
                 }
             }
 
-            if (bPort60h)
+            if (bDetected)
             {
                 /* It's the emulated 8042 PS/2 mouse/kbd device, so mark it as the Host one.
@@ -234 +251 @@
                 InterlockedExchange (&g_ctx.fHostMouseFound, TRUE);
                 devExt->HostMouse = TRUE;
-                dprintf(("VBoxMouse::vboxDeviceAdded: host mouse found.\n"));
+                dprintf(("VBoxMouse::vboxDeviceAdded: Host mouse found.\n"));
             }
         }
@@ -274 +291 @@
             dprintf(("VBoxMouse::vboxDeviceRemoved: the request allocation has failed.\n"));
         }
-    
+
         InterlockedExchange (&g_ctx.fHostInformed, FALSE);
     }
@@ -303 +320 @@
 static void vboxInformHost (PDEVICE_EXTENSION devExt)
 {
-    dprintf (("VBoxMouse::vboxInformHost: %p\n", devExt));
+    dprintf (("VBoxMouse::vboxInformHost: DevExt=%p, HostMouse=%d\n", devExt, devExt->HostMouse));
 
     if (vboxIsVBGLInited ())