Changeset 68654 in vbox for trunk/src/VBox/Additions/solaris

Timestamp:

Sep 5, 2017 5:22:12 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117885

Message:

VBoxGuestR0Lib: Function prefix and DECL macro cleanups.

Location:

trunk/src/VBox/Additions/solaris/Mouse

Files:

• testcase/solaris.h (modified) (1 diff)
• vboxms.c (modified) (6 diffs)

trunk/src/VBox/Additions/solaris/Mouse/testcase/solaris.h

@@ -347 +347 @@
 #define VBoxGuestCommonIOCtl(...) VINF_SUCCESS
 #define VBoxGuestCommonISR(...) true
-#define VbglGRAlloc(...) VINF_SUCCESS
-#define VbglGRPerform(...) VINF_SUCCESS
-#define VbglGRFree(...) do {} while(0)
+#define VbglR0GRAlloc(...) VINF_SUCCESS
+#define VbglR0GRPerform(...) VINF_SUCCESS
+#define VbglR0GRFree(...) do {} while(0)
 #endif
 #define VbglR0InitClient(...) VINF_SUCCESS

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

@@ -472 +472 @@
         if (RT_SUCCESS(rc))
         {
-            rc = VbglGRAlloc((VMMDevRequestHeader **)
+            rc = VbglR0GRAlloc((VMMDevRequestHeader **)
                              &pState->pMouseStatusReq,
                              sizeof(*pState->pMouseStatusReq),
@@ -488 +488 @@
                 qprocson(pReadQueue);
                 /* Enable our IRQ handler. */
-                rc2 = VbglSetMouseNotifyCallback(vbmsSolNotify,
-                                                 (void *)pState);
+                rc2 = VbglR0SetMouseNotifyCallback(vbmsSolNotify, (void *)pState);
                 if (RT_FAILURE(rc2))
                     /* Log the failure.  I may well have not understood what
@@ -525 +524 @@
     pState->pMouseStatusReq->pointerXPos = 0;
     pState->pMouseStatusReq->pointerYPos = 0;
-    rc = VbglGRPerform(&pState->pMouseStatusReq->header);
+    rc = VbglR0GRPerform(&pState->pMouseStatusReq->header);
     if (RT_SUCCESS(rc))
     {
@@ -590 +589 @@
     if (!pState->cInits)
     {
-        VbglSetMouseStatus(0);
+        VbglR0SetMouseStatus(0);
         /* Disable our IRQ handler. */
-        VbglSetMouseNotifyCallback(NULL, NULL);
+        VbglR0SetMouseNotifyCallback(NULL, NULL);
         qprocsoff(pReadQueue);
 
@@ -600 +599 @@
         ASMAtomicWriteNullPtr(&pState->pWriteQueue);
         pReadQueue->q_ptr = NULL;
-        VbglGRFree(&pState->pMouseStatusReq->header);
+        VbglR0GRFree(&pState->pMouseStatusReq->header);
         VbglR0TerminateClient();
     }
@@ -1376 +1375 @@
             pState->cMaxScreenY = pResolution->height - 1;
             /* Note: we don't disable this again until session close. */
-            rc = VbglSetMouseStatus(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                    | VMMDEV_MOUSE_NEW_PROTOCOL);
+            rc = VbglR0SetMouseStatus(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
+                                      | VMMDEV_MOUSE_NEW_PROTOCOL);
             if (RT_SUCCESS(rc))
                 return 0;