Changeset 42043 in vbox for trunk/src

Timestamp:

Jul 6, 2012 5:01:15 PM (13 years ago)

Author:

vboxsync

Message:

Additions/solaris/vboxmouse: preallocate GR request.

File:

• trunk/src/VBox/Additions/solaris/Mouse/vboxmouse.c (modified) (5 diffs)

trunk/src/VBox/Additions/solaris/Mouse/vboxmouse.c

@@ -218 +218 @@
 {
     /** Device handle. */
-    dev_info_t        *pDip;
+    dev_info_t           *pDip;
     /** Mutex protecting the guest library against multiple initialistation or
      * uninitialisation. */
-    kmutex_t           InitMtx;
+    kmutex_t              InitMtx;
     /** Initialisation counter for the guest library. */
-    size_t             cInits;
+    size_t                cInits;
     /** The STREAMS write queue which we need for sending messages up to
      * user-space. */
-    queue_t           *pWriteQueue;
+    queue_t              *pWriteQueue;
+    /** Pre-allocated mouse status VMMDev request for use in the IRQ
+     * handler. */
+    VMMDevReqMouseStatus *pMouseStatusReq;
     /* The current greatest horizontal pixel offset on the screen, used for
      * absolute mouse position reporting.
      */
-    int                cMaxScreenX;
+    int                   cMaxScreenX;
     /* The current greatest vertical pixel offset on the screen, used for
      * absolute mouse position reporting.
      */
-    int                cMaxScreenY;
+    int                   cMaxScreenY;
 } VBMSSTATE, *PVBMSSTATE;
 
@@ -443 +446 @@
     mutex_enter(&g_OpenNodeState.InitMtx);
     if (!g_OpenNodeState.cInits)
+    {
         rc = VbglInit();
+        if (RT_SUCCESS(rc))
+        {
+            rc = VbglGRAlloc((VMMDevRequestHeader **)
+                             &g_OpenNodeState.pMouseStatusReq,
+                             sizeof(*g_OpenNodeState.pMouseStatusReq),
+                             VMMDevReq_GetMouseStatus);
+            if (RT_FAILURE(rc))
+                VbglTerminate();
+        }
+    }
     ++g_OpenNodeState.cInits;
     mutex_exit(&g_OpenNodeState.InitMtx);
@@ -502 +516 @@
     PVBMSSTATE pState = (PVBMSSTATE)pvState;
     int rc;
-    uint32_t x, y;
     LogRelFlow((DEVICE_NAME "::NativeISRMousePollEvent:\n"));
 
-    rc = VbglGetMouseStatus(NULL, &x, &y);
+    pState->pMouseStatusReq->mouseFeatures = 0;
+    pState->pMouseStatusReq->pointerXPos = 0;
+    pState->pMouseStatusReq->pointerYPos = 0;
+    rc = VbglGRPerform(&pState->pMouseStatusReq->header);
     if (RT_SUCCESS(rc))
     {
         int cMaxScreenX  = pState->cMaxScreenX;
         int cMaxScreenY  = pState->cMaxScreenY;
+        int x = pState->pMouseStatusReq->pointerXPos;
+        int y = pState->pMouseStatusReq->pointerYPos;
 
         if (cMaxScreenX && cMaxScreenY)
@@ -541 +559 @@
     if (canput(pReadQueue->q_next))
         putnext(pReadQueue, pMBlk);
-    else
-        putbq(pReadQueue, pMBlk);
+    // else
+    //     putq(pReadQueue, pMBlk);
 }
 
@@ -577 +595 @@
     --g_OpenNodeState.cInits;
     if (!g_OpenNodeState.cInits)
+    {
+        VbglGRFree(&g_OpenNodeState.pMouseStatusReq->header);
         VbglTerminate();
+    }
     mutex_exit(&g_OpenNodeState.InitMtx);
     return 0;