Changeset 23160 in vbox

Timestamp:

Sep 19, 2009 8:15:38 PM (15 years ago)

Author:

vboxsync

Message:

Serial: Add support for break conditions. On Windows it also possible to detect break conditions on the serial device

Location:

trunk

Files:

• include/VBox/pdmifs.h (modified) (2 diffs)
• src/VBox/Devices/Serial/DevSerial.cpp (modified) (4 diffs)
• src/VBox/Devices/Serial/DrvChar.cpp (modified) (2 diffs)
• src/VBox/Devices/Serial/DrvHostSerial.cpp (modified) (3 diffs)

trunk/include/VBox/pdmifs.h

@@ -1446 +1446 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnNotifyStatusLinesChanged,(PPDMICHARPORT pInterface, uint32_t fNewStatusLines));
+
+    /**
+     * Notify the device/driver that a break occurred.
+     *
+     * @returns VBox statsus code.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnNotifyBreak,(PPDMICHARPORT pInterface));
 } PDMICHARPORT;
 
@@ -1492 +1501 @@
     DECLR3CALLBACKMEMBER(int, pfnSetModemLines,(PPDMICHAR pInterface, bool fRequestToSend, bool fDataTerminalReady));
 
+    /**
+     * Sets the TD line into break condition.
+     *
+     * @returns VBox status code.
+     * @param   pInterface  Pointer to the interface structure containing the called function pointer.
+     * @param   fBreak      Set to true to let the device send a break false to put into normal operation.
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSetBreak,(PPDMICHAR pInterface, bool fBreak));
 } PDMICHAR;
 

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

@@ -200 +200 @@
     } else if (s->msr_changed && (s->ier & UART_IER_RLSI)) {
         s->iir = UART_IIR_RLSI;
+    } else if (s->lsr & UART_LSR_BI) {
+        s->iir = 0; /* No special status bit */
     } else {
         s->iir = UART_IIR_NO_INT;
@@ -308 +310 @@
             if (break_enable != s->last_break_enable) {
                 s->last_break_enable = break_enable;
+                if (RT_LIKELY(s->pDrvChar))
+                {
+                    Log(("serial_io_port_write: Set break %d\n", break_enable));
+                    int rc = s->pDrvChar->pfnSetBreak(s->pDrvChar, !!break_enable);
+                    AssertRC(rc);
+                }
             }
         }
@@ -494 +502 @@
 }
 
+static DECLCALLBACK(int) serialNotifyBreak(PPDMICHARPORT pInterface)
+{
+    SerialState *pThis = PDMICHARPORT_2_SERIALSTATE(pInterface);
+
+    Log(("%s: pInterface=%p\n", __FUNCTION__, pInterface));
+
+    PDMCritSectEnter(&pThis->CritSect, VERR_PERMISSION_DENIED);
+
+    pThis->lsr |= UART_LSR_BI;
+    serial_update_irq(pThis);
+
+    PDMCritSectLeave(&pThis->CritSect);
+
+    return VINF_SUCCESS;
+}
+
 #endif /* IN_RING3 */
 
@@ -757 +781 @@
 
     /* ICharPort */
-    pThis->ICharPort.pfnNotifyRead = serialNotifyRead;
+    pThis->ICharPort.pfnNotifyRead               = serialNotifyRead;
     pThis->ICharPort.pfnNotifyStatusLinesChanged = serialNotifyStatusLinesChanged;
+    pThis->ICharPort.pfnNotifyBreak              = serialNotifyBreak;
 
 #ifdef VBOX_SERIAL_PCI

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

@@ -284 +284 @@
 }
 
+/**
+ * Sets the TD line into break condition.
+ *
+ * @returns VBox status code.
+ * @param   pInterface  Pointer to the interface structure containing the called function pointer.
+ * @param   fBreak      Set to true to let the device send a break false to put into normal operation.
+ * @thread  Any thread.
+ */
+static DECLCALLBACK(int) drvCharSetBreak(PPDMICHAR pInterface, bool fBreak)
+{
+    /* Nothing to do here. */
+    return VINF_SUCCESS;
+}
+
 /* -=-=-=-=- driver interface -=-=-=-=- */
 
@@ -307 +321 @@
     pThis->IChar.pfnSetParameters           = drvCharSetParameters;
     pThis->IChar.pfnSetModemLines           = drvCharSetModemLines;
+    pThis->IChar.pfnSetBreak                = drvCharSetBreak;
 
     /*

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

@@ -849 +849 @@
                 cbRemaining = dwNumberOfBytesTransferred;
             }
+            else if (dwEventMask & EV_BREAK)
+            {
+                Log(("HostSerial#%d: Detected break\n"));
+                rc = pThis->pDrvCharPort->pfnNotifyBreak(pThis->pDrvCharPort);
+            }
             else
             {
@@ -1174 +1179 @@
 }
 
+/**
+ * Sets the TD line into break condition.
+ *
+ * @returns VBox status code.
+ * @param   pInterface  Pointer to the interface structure containing the called function pointer.
+ * @param   fBreak      Set to true to let the device send a break false to put into normal operation.
+ * @thread  Any thread.
+ */
+static DECLCALLBACK(int) drvHostSerialSetBreak(PPDMICHAR pInterface, bool fBreak)
+{
+    PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
+
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+    if (fBreak)
+        ioctl(pThis->DeviceFile, TIOCSBRK);
+    else
+        ioctl(pThis->DeviceFile, TIOCCBRK);
+
+#elif defined(RT_OS_WINDOWS)
+    if (fBreak)
+        SetCommBreak(pThis->hDeviceFile);
+    else
+        ClearCommBreak(pThis->hDeviceFile);
+#endif
+
+    return VINF_SUCCESS;
+}
+
 /* -=-=-=-=- driver interface -=-=-=-=- */
 
@@ -1198 +1231 @@
 #endif
     /* IBase. */
-    pDrvIns->IBase.pfnQueryInterface        = drvHostSerialQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface = drvHostSerialQueryInterface;
     /* IChar. */
-    pThis->IChar.pfnWrite                   = drvHostSerialWrite;
-    pThis->IChar.pfnSetParameters           = drvHostSerialSetParameters;
-    pThis->IChar.pfnSetModemLines           = drvHostSerialSetModemLines;
+    pThis->IChar.pfnWrite            = drvHostSerialWrite;
+    pThis->IChar.pfnSetParameters    = drvHostSerialSetParameters;
+    pThis->IChar.pfnSetModemLines    = drvHostSerialSetModemLines;
+    pThis->IChar.pfnSetBreak         = drvHostSerialSetBreak;
 
 /** @todo Initialize all members with NIL values!! The destructor is ALWAYS called. */