Changeset 9079 for trunk/src/kernel32/hmcomm.cpp

Timestamp:

Aug 21, 2002, 7:23:12 PM (23 years ago)

Author:

sandervl

Message:

EV_RLSD/MS_RLSD_ON status corresponds to OS/2 DCD (data carrier detect) status GetCommModemStatus & GetCommEvent changed

File:

• trunk/src/kernel32/hmcomm.cpp (modified) (10 diffs)

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.37 2002-07-06 09:57:31 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.38 2002-08-21 17:23:12 sandervl Exp $ */
 
 /*
@@ -61 +61 @@
 static DWORD CommWriteIOHandler(LPASYNCIOREQUEST lpRequest, DWORD *lpdwResult, DWORD *lpdwTimeOut);
 static DWORD CommPollIOHandler(LPASYNCIOREQUEST lpRequest, DWORD *lpdwResult, DWORD *lpdwTimeOut);
-
+#ifdef DEBUG
+static char *DebugCommEvent(DWORD dwEvents);
+static char *DebugModemStatus(DWORD dwModemStatus);
+#endif
 //******************************************************************************
 //******************************************************************************
@@ -416 +419 @@
     if(!rc)
     {
+#ifdef DEBUG
+        if(COMEvt) dprintf(("ASYNC_GETCOMMEVENT %x", COMEvt));
+#endif
         dwEvent |= (COMEvt&0x0001)? EV_RXCHAR:0;
         //dwEvent |= (COMEvt&0x0002)? 0:0;
@@ -421 +427 @@
         dwEvent |= (COMEvt&0x0008)? EV_CTS:0;
         dwEvent |= (COMEvt&0x0010)? EV_DSR:0;
-        //dwEvent |= (COMEvt&0x0020)? 0:0; DCS = RLSD?
+        dwEvent |= (COMEvt&0x0020)? EV_RLSD:0;
         dwEvent |= (COMEvt&0x0040)? EV_BREAK:0;
         dwEvent |= (COMEvt&0x0080)? EV_ERR:0;
@@ -442 +448 @@
         }
         if((dwEvent & dwMask)) {
-            dprintf(("CommPollIOHandler: event(s) %x occured", (dwEvent & dwMask)));
+            dprintf(("CommPollIOHandler: event(s) %s %x occured", DebugCommEvent((dwEvent & dwMask)), (dwEvent & dwMask)));
             *lpdwResult = (dwEvent & dwMask);
             return ERROR_SUCCESS;
@@ -689 +695 @@
             dwEvent |= (COMEvt&0x0008)? EV_CTS:0;
             dwEvent |= (COMEvt&0x0010)? EV_DSR:0;
-            //dwEvent |= (COMEvt&0x0020)? 0:0; DCS = RLSD?
+            dwEvent |= (COMEvt&0x0020)? EV_RLSD:0;
             dwEvent |= (COMEvt&0x0040)? EV_BREAK:0;
             dwEvent |= (COMEvt&0x0080)? EV_ERR:0;
@@ -701 +707 @@
     if(dwMask == pDevData->dwEventMask) {
         *lpfdwEvtMask = (rc==0) ? (dwEvent & dwMask) : 0;
-        dprintf(("WaitCommEvent returned %x", *lpfdwEvtMask));
+        dprintf(("WaitCommEvent returned %s %x", DebugCommEvent(*lpfdwEvtMask), *lpfdwEvtMask));
     }
     else  *lpfdwEvtMask = 0;
@@ -834 +840 @@
   dprintf(("HMDeviceCommClass::SetCommMask %x", fdwEvtMask));
 
-  if(fdwEvtMask & (EV_RLSD|EV_RXFLAG)) {
-      dprintf(("!WARNING! SetCommMask: unsupported flags EV_RLSD and/or EV_RXFLAG!!"));
-  }
-
-  pDevData->dwEventMask = fdwEvtMask & ~(EV_RLSD|EV_RXFLAG); // Clear the 2 not supported Flags.
+  if(fdwEvtMask & (EV_RXFLAG)) {
+      dprintf(("!WARNING! SetCommMask: unsupported flag EV_RXFLAG!!"));
+  }
+
+  pDevData->dwEventMask = fdwEvtMask & ~(EV_RXFLAG); // Clear the not supported Flag.
   return(TRUE);
 }
@@ -1051 +1057 @@
     *lpModemStat |= (ucStatus & 0x20)? MS_DSR_ON:0;
     *lpModemStat |= (ucStatus & 0x40)? MS_RING_ON:0;
-    //*lpModemStat |= (ucStatus & 0x80)? MS_RSLD_ON:0;
-  }
-
-  dprintf2(("HMDeviceCommClass::GetCommModemStatus -> %x rc=%d", *lpModemStat, rc));
+    *lpModemStat |= (ucStatus & 0x80)? MS_RLSD_ON:0;
+  }
+
+  dprintf2(("HMDeviceCommClass::GetCommModemStatus -> %s %x rc=%d", DebugModemStatus(*lpModemStat), *lpModemStat, rc));
   return(rc==0);
 }
@@ -1584 +1590 @@
     }
 }
+#ifdef DEBUG
+//******************************************************************************
+//******************************************************************************
+static char *DebugCommEvent(DWORD dwEvents)
+{
+    static char szCommEvents[128];
+ 
+    szCommEvents[0] = 0;
+
+    if(dwEvents & EV_RXCHAR) {
+        strcat(szCommEvents, "EV_RXCHAR ");
+    }
+    if(dwEvents & EV_TXEMPTY) {
+        strcat(szCommEvents, "EV_TXEMPTY ");
+    }
+    if(dwEvents & EV_CTS) {
+        strcat(szCommEvents, "EV_CTS ");
+    }
+    if(dwEvents & EV_DSR) {
+        strcat(szCommEvents, "EV_DSR ");
+    }
+    if(dwEvents & EV_RLSD) {
+        strcat(szCommEvents, "EV_RLSD ");
+    }
+    if(dwEvents & EV_BREAK) {
+        strcat(szCommEvents, "EV_BREAK ");
+    }
+    if(dwEvents & EV_ERR) {
+        strcat(szCommEvents, "EV_ERR ");
+    }
+    if(dwEvents & EV_RING) {
+        strcat(szCommEvents, "EV_RING ");
+    }
+    return szCommEvents;
+}
+//******************************************************************************
+//******************************************************************************
+static char *DebugModemStatus(DWORD dwModemStatus)
+{
+    static char szModemStatus[128];
+ 
+    szModemStatus[0] = 0;
+
+    if(dwModemStatus & MS_CTS_ON) {
+        strcat(szModemStatus, "MS_CTS_ON ");
+    }
+    if(dwModemStatus & MS_DSR_ON) {
+        strcat(szModemStatus, "MS_DSR_ON ");
+    }
+    if(dwModemStatus & MS_RING_ON) {
+        strcat(szModemStatus, "MS_RING_ON ");
+    }
+    if(dwModemStatus & MS_RLSD_ON) {
+        strcat(szModemStatus, "MS_RLSD_ON ");
+    }
+    return szModemStatus;
+}
+#endif
 //******************************************************************************
 //******************************************************************************