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

Timestamp:

Jul 28, 2003, 1:35:32 PM (22 years ago)

Author:

sandervl

Message:

Updates

File:

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

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.39 2003-05-23 13:53:43 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.40 2003-07-28 11:35:31 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #include <os2win.h>
 #include <string.h>
+#include <stdio.h>
 #include <handlemanager.h>
 #include "handlenames.h"
@@ -64 +65 @@
 static char *DebugCommEvent(DWORD dwEvents);
 static char *DebugModemStatus(DWORD dwModemStatus);
+#ifdef DEBUG_COMOUTPUT
+static FILE *comlog = NULL;
+#endif
 #endif
 //******************************************************************************
@@ -117 +121 @@
     HandleNamesAddSymbolicLink("AUX:",       "COM1");
     HandleNamesAddSymbolicLink("\\\\.\\AUX", "COM1");
+#ifdef DEBUG_COMOUTPUT
+    comlog = fopen("comlog", "w");
+#endif
 }
 
@@ -229 +236 @@
             return rc;
         }
+
         rc = SetBaud(pHMHandleData,9600);
         dprintf(("Init Baud to 9600 rc = %d",rc));
@@ -328 +336 @@
 
     *lpdwResult = (ret) ? ulBytesRead : 0;
-    dprintf2(("KERNEL32: CommReadIOHandler %d bytes read", *lpdwResult));
+    dprintf(("KERNEL32: CommReadIOHandler %d bytes read", *lpdwResult));
 
     if(ret == FALSE) {
@@ -335 +343 @@
     else {
 #ifdef DEBUG
+        if(ulBytesRead < qInfo.cch) {
+            dprintf(("WARNING: Not all data removed from queue!!"));
+        }
         dprintf2(("%d Bytes read:", ulBytesRead));
         for(int i=0;i<min(ulBytesRead, 16);i++) {
@@ -372 +383 @@
     dprintf2(("KERNEL32:CommWriteIOHandler %d byte(s) written", *lpdwResult));
 
+    if(ulBytesWritten != lpRequest->nNumberOfBytes) {
+        dprintf(("WARNING: ulBytesWritten (%d) != lpRequest->nNumberOfBytes (%d)", ulBytesWritten, lpRequest->nNumberOfBytes));
+    }
     if(ret == FALSE) {
        dprintf(("!ERROR!: CommWriteIOHandler failed with rc %d", GetLastError()));
@@ -432 +446 @@
         dwEvent |= (COMEvt&0x0100)? EV_RING:0;
  
+#ifdef DEBUG
+        if(dwEvent & EV_ERR) {
+            ULONG COMErr = 0;
+
+            rc = OSLibDosDevIOCtl( pHMHandleData->hHMHandle,
+                    IOCTL_ASYNC,
+                    ASYNC_GETCOMMERROR,
+                    0,0,0,
+                    &COMErr,2,&ulLen);
+
+            dprintf(("!!!!!!!----> ERROR OCCURRED (EV_ERR) reason %x <-----!!!!!", COMErr));
+
+        }
+#endif
         if((dwEvent & EV_RXCHAR) && (dwMask & EV_RXCHAR)) 
         {
@@ -509 +537 @@
     }
 
+#ifdef DEBUG
+    dprintf2(("WriteFile: bytes to write:"));
+    for(int i=0;i<min(nNumberOfBytesToWrite, 16);i++) {
+        dprintf2(("%x %c", ((char *)lpBuffer)[i], ((char *)lpBuffer)[i]));
+    }
+#endif
+
     if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
         return pDevData->iohandler->WriteFile(pHMHandleData->hWin32Handle, lpBuffer, nNumberOfBytesToWrite,
@@ -517 +552 @@
                         &ulBytesWritten);
 
-    if(lpNumberOfBytesWritten) {
+    if(lpNumberOfBytesWritten) { 
        *lpNumberOfBytesWritten = (ret) ? ulBytesWritten : 0;
        dprintf2(("KERNEL32:HMDeviceCommClass::WriteFile %d byte(s) written", *lpNumberOfBytesWritten));
@@ -593 +628 @@
         *lpNumberOfBytesRead = (ret) ? ulBytesRead : 0;
         dprintf2(("KERNEL32:HMDeviceCommClass::ReadFile %d bytes read", *lpNumberOfBytesRead));
+        if(qInfo.cch > ulBytesRead) {
+            dprintf(("Warning: more bytes available!!"));
+        }
     }
     if(ret == FALSE) {
@@ -599 +637 @@
 #ifdef DEBUG
     else {
+        int i;
         dprintf2(("%d Bytes read:", ulBytesRead));
-        for(int i=0;i<min(ulBytesRead, 16);i++) {
+#ifdef DEBUG_COMOUTPUT
+        char *tmp = (char *)malloc(ulBytesRead+1);
+        memcpy(tmp, lpBuffer, ulBytesRead);
+        tmp[ulBytesRead] = 0;
+        dprintf2(("RF: %s", tmp));
+        WORD sel = RestoreOS2FS();
+        for(i=0;i<ulBytesRead;i++) {
+            fprintf(comlog, "%c", tmp[i]);
+        }
+        SetFS(sel);
+        free(tmp);
+#endif
+        for(i=0;i<ulBytesRead;i++) {
             dprintf2(("%x %c", ((char *)lpBuffer)[i], ((char *)lpBuffer)[i]));
         }
@@ -893 +944 @@
   if(lpdwErrors == NULL) 
      lpdwErrors = &dwError;
-
+ 
   dprintf(("HMDeviceCommClass::ClearCommError"));
   ulLen = sizeof(USHORT);
@@ -908 +959 @@
   *lpdwErrors |= (COMErr & 0x0008)?CE_FRAME:0;
 
+  dprintf(("Error %x", *lpdwErrors));
   if(lpcst)
   {
@@ -1530 +1582 @@
     pCurDCB->XoffChar           = XoffChar;
     pCurDCB->ErrorChar          = ErrorChar;
+
+    dprintf(("OS/2 DCB:\n"
+             " WriteTimeout           : %d\n"
+             " ReadTimeout            : %d\n"
+             " CtlHandshake           : 0x%x\n"
+             " FlowReplace            : 0x%x\n"
+             " Timeout                : 0x%x\n"
+             " Error replacement Char : 0x%x\n"
+             " Break replacement Char : 0x%x\n"
+             " XON Char               : 0x%x\n"
+             " XOFF Char              : 0x%x\n",
+             os2dcb.usWriteTimeout,
+             os2dcb.usReadTimeout,
+             os2dcb.fbCtlHndShake,
+             os2dcb.fbFlowReplace,
+             os2dcb.fbTimeOut,
+             os2dcb.bErrorReplacementChar,
+             os2dcb.bBreakReplacementChar,
+             os2dcb.bXONChar,
+             os2dcb.bXOFFChar));
+
   }