Changeset 37596 in vbox for trunk/src/VBox/Devices/USB/solaris

Timestamp:

Jun 22, 2011 7:30:06 PM (14 years ago)

Author:

vboxsync

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

72442

Message:

*: RTFILE becomes a pointer, RTFileOpen++ expands it's flags paramter from uint32_t to uint64_t.

File:

• trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp

@@ -80 +80 @@
     char                          *pszDevicePath;
     /** The connection to the client driver. */
-    RTFILE                         File;
+    RTFILE                         hFile;
     /** Pointer to the proxy device instance. */
     PUSBPROXYDEV                   pProxyDev;
@@ -196 +196 @@
 static void usbProxySolarisCloseFile(PUSBPROXYDEVSOL pDevSol)
 {
-    if (pDevSol->File != NIL_RTFILE)
-    {
-        RTFileClose(pDevSol->File);
-        pDevSol->File = NIL_RTFILE;
-    }
+    RTFileClose(pDevSol->hFile);
+    pDevSol->hFile = NIL_RTFILE;
 }
 
@@ -215 +212 @@
 static int usbProxySolarisIOCtl(PUSBPROXYDEVSOL pDevSol, unsigned Function, void *pvData, size_t cbData)
 {
-    if (RT_UNLIKELY(pDevSol->File == NIL_RTFILE))
+    if (RT_UNLIKELY(pDevSol->hFile == NIL_RTFILE))
     {
         LogFlow((USBPROXY ":usbProxySolarisIOCtl connection to driver gone!\n"));
@@ -228 +225 @@
 
     int Ret = -1;
-    int rc = RTFileIoCtl(pDevSol->File, Function, &Req, sizeof(Req), &Ret);
+    int rc = RTFileIoCtl(pDevSol->hFile, Function, &Req, sizeof(Req), &Ret);
     if (RT_SUCCESS(rc))
     {
@@ -327 +324 @@
                          * Open the client driver.
                          */
-                        RTFILE File;
-                        rc = RTFileOpen(&File, pDevSol->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+                        RTFILE hFile;
+                        rc = RTFileOpen(&hFile, pDevSol->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
                         if (RT_SUCCESS(rc))
                         {
-                            pDevSol->File = File;
+                            pDevSol->hFile = hFile;
                             pDevSol->pProxyDev = pProxyDev;
 
@@ -363 +360 @@
                             }
 
-                            RTFileClose(pDevSol->File);
-                            pDevSol->File = NIL_RTFILE;
+                            RTFileClose(pDevSol->hFile);
+                            pDevSol->hFile = NIL_RTFILE;
                             pDevSol->pProxyDev = NULL;
                         }
@@ -721 +718 @@
         {
             struct pollfd pfd;
-            int rc;
-
-            pfd.fd = pDevSol->File;
+            pfd.fd = RTFileToNative(pDevSol->hFile);
             pfd.events = POLLIN;
             pfd.revents = 0;
-            rc = poll(&pfd, 1, cMillies);
-
+            int rc = poll(&pfd, 1, cMillies);
             if (rc > 0)
             {