Changeset 15831 in vbox

Timestamp:

Jan 7, 2009 12:51:42 PM (16 years ago)

Author:

vboxsync

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

41419

Message:

DrvHostBase.h,DrvHostDVD.cpp: nitpicking: Changed pbDoubleBuffer to uint8_t * from void * so it matches the name. Corrected method order as well as some spaces, comments and indentation.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvHostBase.h (modified) (1 diff)
• DrvHostDVD.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Storage/DrvHostBase.h

@@ -134 +134 @@
     /** Double buffer required for ioctl with the Linux kernel as long as we use
      * remap_pfn_range() instead of vm_insert_page(). */
-    void                    *pbDoubleBuffer;
+    uint8_t                *pbDoubleBuffer;
 #endif
 

trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

@@ -632 +632 @@
 }
 
+
 #ifdef VBOX_WITH_SUID_WRAPPER
 /* These functions would have to go into a seperate solaris binary with
@@ -637 +638 @@
  * return the value. BUT... this might be prohibitively slow.
  */
-#ifdef RT_OS_SOLARIS
+# ifdef RT_OS_SOLARIS
+
 /**
  * Checks if the current user is authorized using Solaris' role-based access control.
@@ -655 +657 @@
 }
 
+
 /**
  * Setuid wrapper to gain root access.
@@ -675 +678 @@
     return VINF_SUCCESS;
 }
+
 
 /**
@@ -697 +701 @@
     return VINF_SUCCESS;
 }
-#endif   /* RT_OS_SOLARIS */
-#endif
+
+# endif   /* RT_OS_SOLARIS */
+#endif /* VBOX_WITH_SUID_WRAPPER */
+
 
 /* -=-=-=-=- driver interface -=-=-=-=- */
+
+
+/** @copydoc FNPDMDRVDESTRUCT */
+DECLCALLBACK(void) drvHostDvdDestruct(PPDMDRVINS pDrvIns)
+{
+#ifdef RT_OS_LINUX
+    PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
+
+    if (pThis->pbDoubleBuffer)
+    {
+        RTMemFree(pThis->pbDoubleBuffer);
+        pThis->pbDoubleBuffer = NULL;
+    }
+#endif
+    return DRVHostBaseDestruct(pDrvIns);
+}
 
 
@@ -735 +757 @@
          */
 #ifdef RT_OS_LINUX
-        pThis->pbDoubleBuffer = RTMemAlloc(SCSI_MAX_BUFFER_SIZE);
+        pThis->pbDoubleBuffer = (uint8_t *)RTMemAlloc(SCSI_MAX_BUFFER_SIZE);
         if (!pThis->pbDoubleBuffer)
             return VERR_NO_MEMORY;
@@ -793 +815 @@
 }
 
-/** @copydoc FNPDMDRVDESTRUCT */
-DECLCALLBACK(void) drvHostDvdDestruct(PPDMDRVINS pDrvIns)
-{
-#ifdef RT_OS_LINUX
-    PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
-
-    if (pThis->pbDoubleBuffer)
-    {
-        RTMemFree(pThis->pbDoubleBuffer);
-        pThis->pbDoubleBuffer = NULL;
-    }
-#endif
-    return DRVHostBaseDestruct(pDrvIns);
-}
 
 /**