Changeset 37597 in vbox for trunk/src/VBox/Devices/Serial

Timestamp:

Jun 22, 2011 8:54:05 PM (13 years ago)

Author:

vboxsync

Message:

darwin build fix

File:

• trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -635 +635 @@
             FD_SET(RTPipeToNative(pThis->hWakeupPipeR), &XcptSet);
 # if 1 /* it seems like this select is blocking the write... */
-            rc = select(RT_MAX(RTFileToPipe(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR)) + 1,
+            rc = select(RT_MAX(RTPipeToNative(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR)) + 1,
                         &RdSet, NULL, &XcptSet, NULL);
 # else
             struct timeval tv = { 0, 1000 };
-            rc = select(RTFileToPipe(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR) + 1,
+            rc = select(RTPipeToNative(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR) + 1,
                         &RdSet, NULL, &XcptSet, &tv);
 # endif
@@ -659 +659 @@
             size_t cbRead;
             if (   FD_ISSET(RTPipeToNative(pThis->hWakeupPipeR), &RdSet)
-                || FD_ISSET(pThis->hWakeupPipeR, &XcptSet))
+                || FD_ISSET(RTPipeToNative(pThis->hWakeupPipeR), &XcptSet))
             {
                 rc = RTPipeRead(pThis->hWakeupPipeR, abBuffer, 1, &cbRead);
@@ -1276 +1276 @@
     /* Linux & darwin needs a separate thread which monitors the status lines. */
 # ifndef RT_OS_LINUX
-    ioctl(pThis->DeviceFile, TIOCMGET, &pThis->fStatusLines);
+    ioctl(RTFileToNative(pThis->hDeviceFile), TIOCMGET, &pThis->fStatusLines);
 # endif
     rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pMonitorThread, pThis, drvHostSerialMonitorThread, drvHostSerialWakeupMonitorThread, 0, RTTHREADTYPE_IO, "SerMon");