Changeset 37596 in vbox for trunk/src/VBox/Devices/Parallel

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp (modified) (18 diffs)

trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

@@ -27 +27 @@
 #include <iprt/assert.h>
 #include <iprt/file.h>
+#include <iprt/pipe.h>
 #include <iprt/semaphore.h>
 #include <iprt/stream.h>
@@ -64 +65 @@
     char                         *pszDevicePath;
     /** Device Handle */
-    RTFILE                        FileDevice;
+    RTFILE                        hFileDevice;
     /** Thread waiting for interrupts. */
     PPDMTHREAD                    pMonitorThread;
     /** Wakeup pipe read end. */
-    RTFILE                        WakeupPipeR;
+    RTPIPE                        hWakeupPipeR;
     /** Wakeup pipe write end. */
-    RTFILE                        WakeupPipeW;
+    RTPIPE                        hWakeupPipeW;
 } DRVHOSTPARALLEL, *PDRVHOSTPARALLEL;
 
@@ -102 +103 @@
     LogFlow(("%s: pvBuf=%#p cbWrite=%d\n", __FUNCTION__, pvBuf, *cbWrite));
 
-    ioctl(pThis->FileDevice, PPWDATA, pBuffer);
+    ioctl(RTFileToNative(pThis->hFileDevice), PPWDATA, pBuffer);
     *cbWrite = 1;
 
@@ -115 +116 @@
     LogFlow(("%s: pvBuf=%#p cbRead=%d\n", __FUNCTION__, pvBuf, cbRead));
 
-    ioctl(pThis->FileDevice, PPRDATA, pBuffer);
+    ioctl(RTFileToNative(pThis->hFileDevice), PPRDATA, pBuffer);
     *cbRead = 1;
 
@@ -140 +141 @@
     }
 
-    ioctl(pThis->FileDevice, PPSETMODE, &ppdev_mode);
+    ioctl(RTFileToNative(pThis->hFileDevice), PPSETMODE, &ppdev_mode);
 
     return VINF_SUCCESS;
@@ -150 +151 @@
 
     LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
-
-    ioctl(pThis->FileDevice, PPWCONTROL, &fReg);
+    ioctl(RTFileToNative(pThis->hFileDevice), PPWCONTROL, &fReg);
 
     return VINF_SUCCESS;
@@ -159 +159 @@
 {
     PDRVHOSTPARALLEL pThis = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
-    uint8_t fReg;
-
-    ioctl(pThis->FileDevice, PPRCONTROL, &fReg);
-
+
+    uint8_t fReg = 0;
+    ioctl(RTFileToNative(pThis->hFileDevice), PPRCONTROL, &fReg);
     LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
-
     *pfReg = fReg;
 
@@ -173 +171 @@
 {
     PDRVHOSTPARALLEL pThis = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
-    uint8_t fReg;
-
-    ioctl(pThis->FileDevice, PPRSTATUS, &fReg);
-
+
+    uint8_t fReg = 0;
+    ioctl(RTFileToNative(pThis->hFileDevice), PPRSTATUS, &fReg);
     LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
-
     *pfReg = fReg;
 
@@ -196 +192 @@
         int rc;
 
-        aFDs[0].fd      = pThis->FileDevice;
+        aFDs[0].fd      = RTFileToNative(pThis->hFileDevice);
         aFDs[0].events  = POLLIN;
         aFDs[0].revents = 0;
-        aFDs[1].fd      = pThis->WakeupPipeR;
+        aFDs[1].fd      = RTPipeToNative(pThis->hWakeupPipeR);
         aFDs[1].events  = POLLIN | POLLERR | POLLHUP;
         aFDs[1].revents = 0;
@@ -218 +214 @@
             char ch;
             size_t cbRead;
-            RTFileRead(pThis->WakeupPipeR, &ch, 1, &cbRead);
+            RTPipeRead(pThis->hWakeupPipeR, &ch, 1, &cbRead);
             continue;
         }
@@ -240 +236 @@
 {
     PDRVHOSTPARALLEL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPARALLEL);
-
-    return RTFileWrite(pThis->WakeupPipeW, "", 1, NULL);
+    size_t cbIgnored;
+    return RTPipeWrite(pThis->hWakeupPipeW, "", 1, &cbIgnored);
 }
 
@@ -257 +253 @@
     LogFlow(("%s: iInstance=%d\n", __FUNCTION__, pDrvIns->iInstance));
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-
-    ioctl(pThis->FileDevice, PPRELEASE);
-
-    if (pThis->WakeupPipeW != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->WakeupPipeW);
-        AssertRC(rc);
-        pThis->WakeupPipeW = NIL_RTFILE;
-    }
-    if (pThis->WakeupPipeR != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->WakeupPipeR);
-        AssertRC(rc);
-        pThis->WakeupPipeR = NIL_RTFILE;
-    }
-    if (pThis->FileDevice != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->FileDevice);
-        AssertRC(rc);
-        pThis->FileDevice = NIL_RTFILE;
-    }
+    int rc;
+
+    if (pThis->hFileDevice != NIL_RTFILE)
+        ioctl(RTFileToNative(pThis->hFileDevice), PPRELEASE);
+
+    rc = RTPipeClose(pThis->hWakeupPipeW); AssertRC(rc);
+    pThis->hWakeupPipeW = NIL_RTPIPE;
+
+    rc = RTPipeClose(pThis->hWakeupPipeR); AssertRC(rc);
+    pThis->hWakeupPipeR = NIL_RTPIPE;
+
+    rc = RTFileClose(pThis->hFileDevice); AssertRC(rc);
+    pThis->hFileDevice = NIL_RTFILE;
+
     if (pThis->pszDevicePath)
     {
@@ -297 +286 @@
 
     /*
-     * Validate the config.
-     */
-    if (!CFGMR3AreValuesValid(pCfg, "DevicePath\0"))
-        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
-                                N_("Unknown host parallel configuration option, only supports DevicePath"));
-
-    /*
      * Init basic data members and interfaces.
-     */
+     *
+     * Must be done before returning any failure because we've got a destructor.
+     */
+    pThis->hFileDevice  = NIL_RTFILE;
+    pThis->hWakeupPipeR = NIL_RTPIPE;
+    pThis->hWakeupPipeW = NIL_RTPIPE;
 
     /* IBase. */
@@ -318 +305 @@
 
     /*
+     * Validate the config.
+     */
+    if (!CFGMR3AreValuesValid(pCfg, "DevicePath\0"))
+        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
+                                N_("Unknown host parallel configuration option, only supports DevicePath"));
+
+    /*
      * Query configuration.
      */
@@ -331 +325 @@
      * Open the device
      */
-    rc = RTFileOpen(&pThis->FileDevice, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    rc = RTFileOpen(&pThis->hFileDevice, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Parallel#%d could not open '%s'"),
@@ -339 +333 @@
      * Try to get exclusive access to parallel port
      */
-    rc = ioctl(pThis->FileDevice, PPEXCL);
+    rc = ioctl(RTFileToNative(pThis->hFileDevice), PPEXCL);
     if (rc < 0)
         return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS,
@@ -349 +343 @@
      * Claim the parallel port
      */
-    rc = ioctl(pThis->FileDevice, PPCLAIM);
+    rc = ioctl(RTFileToNative(pThis->hFileDevice), PPCLAIM);
     if (rc < 0)
         return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS,
@@ -367 +361 @@
      * Create wakeup pipe.
      */
-    int aFDs[2];
-    if (pipe(aFDs) != 0)
-    {
-        rc = RTErrConvertFromErrno(errno);
-        AssertRC(rc);
-        return rc;
-    }
-    pThis->WakeupPipeR = aFDs[0];
-    pThis->WakeupPipeW = aFDs[1];
+    rc = RTPipeCreate(&pThis->hWakeupPipeR, &pThis->hWakeupPipeR, 0 /*fFlags*/);
+    AssertRCReturn(rc, rc);
 
     /*