Changeset 6185 in vbox

Timestamp:

Dec 26, 2007 7:40:48 PM (17 years ago)

Author:

vboxsync

Message:

Add status line monitoring for windows hosts

File:

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

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

@@ -605 +605 @@
             if (pThread->enmState != PDMTHREADSTATE_RUNNING)
                 break;
-            if (!ReadFile(pData->hDeviceFile, abBuffer, sizeof(abBuffer), &dwNumberOfBytesTransferred, &pData->overlappedRecv))
-            {
-                LogRel(("HostSerial#%d: Read failed with error %Vrc; terminating the worker thread.\n", pDrvIns->iInstance, RTErrConvertFromWin32(GetLastError())));
-                break;
-            }
-            cbRemaining = dwNumberOfBytesTransferred;
-
+
+            /* Check the event */
+            if (dwEventMask & EV_RXCHAR)
+            {
+                if (!ReadFile(pData->hDeviceFile, abBuffer, sizeof(abBuffer), &dwNumberOfBytesTransferred, &pData->overlappedRecv))
+                {
+                    LogRel(("HostSerial#%d: Read failed with error %Vrc; terminating the worker thread.\n", pDrvIns->iInstance, RTErrConvertFromWin32(GetLastError())));
+                    break;
+                }
+                cbRemaining = dwNumberOfBytesTransferred;
+            }
+            else
+            {
+                /* The status lines have changed. Notify the device. */
+                DWORD dwNewStatusLinesState = 0;
+                uint8_t uNewStatusLinesState = 0;
+
+                /* Get the new state */
+                if (GetModemStatus(pData->hDeviceFile, &dwNewStatusLinesState))
+                {
+                    if (dwNewStatusLinesState & MS_RLSD_ON)
+                        uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_DCD;
+                    if (dwNewStatusLinesState & MS_RING_ON)
+                        uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_RI;
+                    if (dwNewStatusLinesState & MS_DSR_ON)
+                        uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_DSR;
+                    if (dwNewStatusLinesState & MS_CTS_ON)
+                        uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_CTS;
+                    rc = pData->pDrvCharPort->pfnNotifyStatusLinesChanged(pData->pDrvCharPort, uNewStatusLinesState);
+                    if (VBOX_FAILURE(rc))
+                    {
+                        /* Notifying device failed, continue but log it */
+                        LogRel(("HostSerial#%d: Notifying device failed with error %Vrc; continuing.\n", pDrvIns->iInstance, rc);
+                    }
+                }
+                else
+                {
+                    /* Getting new state failed, continue but log it */
+                    LogRel(("HostSerial#%d: Getting status lines state failed with error %Vrc; continuing.\n", pDrvIns->iInstance, RTErrConvertFromWin32(GetLastError())));
+                }
+            }
 #endif
 
@@ -667 +701 @@
 }
 
+#if defined(RT_OS_LINUX)
 /* -=-=-=-=- Monitor thread -=-=-=-=- */
 
@@ -683 +718 @@
     PDRVHOSTSERIAL pData = PDMINS2DATA(pDrvIns, PDRVHOSTSERIAL);
     int rc = VINF_SUCCESS;
-
-#if defined (RT_OS_LINUX)
     unsigned uStatusLinesToCheck = 0;
 
     uStatusLinesToCheck = TIOCM_CAR | TIOCM_RNG | TIOCM_LE | TIOCM_CTS;
-#endif
 
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
@@ -696 +728 @@
     {
         uint32_t newStatusLine = 0;
-
-#if defined(RT_OS_LINUX)
         unsigned int statusLines;
 
@@ -718 +748 @@
             newStatusLine |= PDM_ICHAR_STATUS_LINES_CTS;
         rc = pData->pDrvCharPort->pfnNotifyStatusLinesChanged(pData->pDrvCharPort, newStatusLine);
-#endif
     }
 
@@ -735 +764 @@
     PDRVHOSTSERIAL pData = PDMINS2DATA(pDrvIns, PDRVHOSTSERIAL);
     int rc = VINF_SUCCESS;
-#if defined(RT_OS_LINUX)
+
     /*
      * Linux is a bit difficult as the thread is sleeping in an ioctl call.
@@ -758 +787 @@
         AssertMsgFailed(("%s: Setting device into normal mode failed. Device is not in a working state!!\n", __FUNCTION__));
 
-#elif defined(RT_OS_WINDOWS)
-    /** @todo */
-#else
-# error adapt me!
-#endif
-
     return rc;
 }
+#endif /* RT_OS_LINUX */
 
 /**
@@ -885 +909 @@
         pData->hDeviceFile = hFile;
         /* for overlapped read */
-        if (!SetCommMask(hFile, EV_RXCHAR))
+        if (!SetCommMask(hFile, EV_RXCHAR | EV_CTS | EV_DSR | EV_RING | EV_RLSD))
         {
             LogRel(("HostSerial#%d: SetCommMask failed with error %d.\n", pDrvIns->iInstance, GetLastError()));
@@ -971 +995 @@
 
 #if defined(RT_OS_LINUX)
+    /* Linux needs a separate thread which monitors the status lines. */
     rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pData->pMonitorThread, pData, drvHostSerialMonitorThread, drvHostSerialWakeupMonitorThread, 0, RTTHREADTYPE_IO, "Serial Monitor");
     if (VBOX_FAILURE(rc))