Changeset 40504 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/solaris

Timestamp:

Mar 16, 2012 4:38:06 PM (13 years ago)

Author:

vboxsync

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

76890

Message:

Solaris 11 build fixes.

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp (modified) (7 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp

@@ -57 +57 @@
 static uint32_t volatile g_cUsers = 0;
 /** VBoxUSB Device handle. */
-static RTFILE g_File = NIL_RTFILE;
+static RTFILE g_hFile = NIL_RTFILE;
 /** List of tasks handled by the USB helper. */
 typedef enum USBHELPER_OP
@@ -93 +93 @@
         return rc;
     }
-    g_File = File;
+    g_hFile = File;
 
     ASMAtomicIncU32(&g_cUsers);
@@ -112 +112 @@
 
             RTFileClose(File);
-            g_File = NIL_RTFILE;
+            g_hFile = NIL_RTFILE;
             ASMAtomicDecU32(&g_cUsers);
             return rc;
@@ -121 +121 @@
         LogRel((USBLIBR3 ":USBMonitor driver version query failed. rc=%Rrc\n", rc));
         RTFileClose(File);
-        g_File = NIL_RTFILE;
+        g_hFile = NIL_RTFILE;
         ASMAtomicDecU32(&g_cUsers);
         return rc;
@@ -142 +142 @@
      * We're the last guy, close down the connection.
      */
-    RTFILE File = g_File;
-    g_File = NIL_RTFILE;
+    RTFILE File = g_hFile;
+    g_hFile = NIL_RTFILE;
     if (File == NIL_RTFILE)
         return VERR_INTERNAL_ERROR;
@@ -238 +238 @@
 static int usblibDoIOCtl(unsigned iFunction, void *pvData, size_t cbData)
 {
-    if (g_File == NIL_RTFILE)
+    if (g_hFile == NIL_RTFILE)
     {
         LogRel((USBLIBR3 ":IOCtl failed, device not open.\n"));
@@ -249 +249 @@
     Hdr.pvDataR3 = pvData;
 
-    int rc = ioctl((int)g_File, iFunction, &Hdr);
+    int rc = ioctl(RTFileToNative(g_hFile), iFunction, &Hdr);
     if (rc < 0)
     {
         rc = errno;
-        LogRel((USBLIBR3 ":IOCtl failed iFunction=%x errno=%d g_file=%d\n", iFunction, rc, (int)g_File));
+        LogRel((USBLIBR3 ":IOCtl failed iFunction=%x errno=%d g_file=%d\n", iFunction, rc, RTFileToNative(g_hFile)));
         return RTErrConvertFromErrno(rc);
     }