Changeset 72073 in vbox

Timestamp:

May 1, 2018 9:46:14 PM (7 years ago)

Author:

vboxsync

Message:

Devices/Serial: New version for the character driver while working on the conversion to the new interface, some updates to the already newly implemented host serial driver

Location:

trunk/src/VBox/Devices/Serial

Files:

• DrvCharNew.cpp (copied) (copied from trunk/src/VBox/Devices/Serial/DrvChar.cpp ) (2 diffs)
• DrvHostSerialNew.cpp (modified) (5 diffs)

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

@@ -11 +11 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 #define LOG_GROUP LOG_GROUP_DRV_CHAR
 #include <VBox/vmm/pdmdrv.h>
+#include <VBox/vmm/pdmserialifs.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox stream I/O devices: Host serial driver
+ * VBox serial devices: Host serial driver
  */
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #define LOG_GROUP LOG_GROUP_DRV_HOST_SERIAL
 #include <VBox/vmm/pdm.h>
+#include <VBox/vmm/pdmserialifs.h>
 #include <VBox/err.h>
 
@@ -442 +443 @@
                           | RTSERIALPORT_OPEN_F_DETECT_BREAK_CONDITION;
     rc = RTSerialPortOpen(&pThis->hSerialPort, pThis->pszDevicePath, fOpenFlags);
+    if (rc == VERR_NOT_SUPPORTED)
+    {
+        /*
+         * For certain devices (or pseudo terminals) status line monitoring does not work
+         * so try again without it.
+         */
+        fOpenFlags &= ~RTSERIALPORT_OPEN_F_SUPPORT_STATUS_LINE_MONITORING;
+        rc = RTSerialPortOpen(&pThis->hSerialPort, pThis->pszDevicePath, fOpenFlags);
+    }
+
     if (RT_FAILURE(rc))
     {
@@ -483 +494 @@
      * Register release statistics.
      */
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatBytesWritten,    STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_BYTES, "Nr of bytes written",         "/Devices/HostSerial%d/Written", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatBytesRead,       STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_BYTES, "Nr of bytes read",            "/Devices/HostSerial%d/Read", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatBytesWritten, STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_BYTES,
+                           "Nr of bytes written",         "/Devices/HostSerial%d/Written", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatBytesRead,    STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_BYTES,
+                           "Nr of bytes read",            "/Devices/HostSerial%d/Read", pDrvIns->iInstance);
 
     return VINF_SUCCESS;
@@ -498 +511 @@
     /* szName */
     "Host Serial",
-        /* szRCMod */
+    /* szRCMod */
     "",
     /* szR0Mod */