Changeset 6087 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 15, 2007 5:02:19 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

26786

Message:

Change Char interface according to the comments int hte header

Location:

trunk/src/VBox/Devices/Serial

Files:

• DevSerial.cpp (modified) (1 diff)
• DrvChar.cpp (modified) (1 diff)
• DrvHostSerial.cpp (modified) (3 diffs)

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

@@ -421 +421 @@
 }
 
-static DECLCALLBACK(int) serialNotifyStatusLinesChanged(PPDMICHARPORT pInterface, PDMICHARSTATUSLINES newStatusLines)
+static DECLCALLBACK(int) serialNotifyStatusLinesChanged(PPDMICHARPORT pInterface, uint32_t newStatusLines)
 {
     SerialState *pData = PDMICHARPORT_2_SERIALSTATE(pInterface);

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

@@ -271 +271 @@
  * @returns VBox status code
  * @param pInterface        Pointer to the interface structure.
- * @param RequestToSend     Set to 1 if this control line should be made active.
- * @param DataTerminalReady Set to 1 if this control line should be made active.
- */
-static DECLCALLBACK(int) drvCharSetModemLines(PPDMICHAR pInterface, unsigned RequestToSend, unsigned DataTerminalReady)
+ * @param RequestToSend     Set to true if this control line should be made active.
+ * @param DataTerminalReady Set to true if this control line should be made active.
+ */
+static DECLCALLBACK(int) drvCharSetModemLines(PPDMICHAR pInterface, bool RequestToSend, bool DataTerminalReady)
 {
     /* Nothing to do here. */

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

@@ -51 +51 @@
  */
 #ifndef TIOCM_LOOP
-# define TIOCM_LOOP     0x8000
+# define TIOCM_LOOP 0x8000
 #endif
 
@@ -690 +690 @@
 #endif
 
+    if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
+        return VINF_SUCCESS;
+
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        PDMICHARSTATUSLINES newStatusLine = 0;
+        uint32_t newStatusLine = 0;
 
 #if defined(RT_OS_LINUX)
@@ -769 +772 @@
  * @returns VBox status code
  * @param pInterface        Pointer to the interface structure.
- * @param RequestToSend     Set to 1 if this control line should be made active.
- * @param DataTerminalReady Set to 1 if this control line should be made active.
- */
-static DECLCALLBACK(int) drvHostSerialSetModemLines(PPDMICHAR pInterface, unsigned RequestToSend, unsigned DataTerminalReady)
-{
+ * @param RequestToSend     Set to true if this control line should be made active.
+ * @param DataTerminalReady Set to true if this control line should be made active.
+ */
+static DECLCALLBACK(int) drvHostSerialSetModemLines(PPDMICHAR pInterface, bool RequestToSend, bool DataTerminalReady)
+{
+    PDRVHOSTSERIAL pData = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
+
 #ifdef RT_OS_LINUX
-    PDRVHOSTSERIAL pData = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
-    int modemState = 0;
+    int modemStateSet = 0;
+    int modemStateClear = 0;
 
     if (RequestToSend)
-    {
-        modemState |= TIOCM_RTS;
-    }
+        modemStateSet |= TIOCM_RTS;
+    else
+        modemStateClear |= TIOCM_RTS;
 
     if (DataTerminalReady)
-    {
-        modemState |= TIOCM_DTR;
-    }
-
-    ioctl(pData->DeviceFile, TIOCMBIS, &modemState);
+        modemStateSet |= TIOCM_DTR;
+    else
+        modemStateClear |= TIOCM_DTR;
+
+    if (modemStateSet)
+        ioctl(pData->DeviceFile, TIOCMBIS, &modemStateSet);
+
+    if (modemStateClear)
+        ioctl(pData->DeviceFile, TIOCMBIC, &modemStateClear);
+#elif defined(RT_OS_WINDOWS)
+    if (RequestToSend)
+        EscapeCommFunction(pData->hDeviceFile, SETRTS);
+    else
+        EscapeCommFunction(pData->hDeviceFIle, CLRRTS);
+
+    if (DataTerminalReady)
+        EscapeCommFunction(pData->hDeviceFile, SETDTR);
+    else
+        EscapeCommFunction(pData->hDeviceFIle, CLRDTR);
 #endif