Changeset 18054

Timestamp:

Nov 30, 2001, 2:52:32 PM (23 years ago)

Author:

sandervl

Message:

implemented PurgeComm

Location:

tags/trunk/src/kernel32

Files:

• hmcomm.cpp (modified) (6 diffs)
• hmcomm.h (modified) (2 diffs)

tags/trunk/src/kernel32/hmcomm.cpp ¶

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.21 2001-11-29 13:38:50 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.22 2001-11-30 13:52:32 sandervl Exp $ */
 
 /*
@@ -318 +318 @@
   if(lpNumberOfBytesWritten) {
        *lpNumberOfBytesWritten = (ret) ? ulBytesWritten : 0;
-       dprintf2(("KERNEL32:HMDeviceCommClass::WriteFile %d bytes written", ulBytesWritten));
+       dprintf2(("KERNEL32:HMDeviceCommClass::WriteFile %d byte(s) written", *lpNumberOfBytesWritten));
   }
   if(ret == FALSE) {
@@ -412 +412 @@
   }
 
+  RXQUEUE qInfo;
+  ULONG ulLen = sizeof(qInfo);
+  ULONG rc = OSLibDosDevIOCtl( pHMHandleData->hHMHandle,
+                        IOCTL_ASYNC,
+                        ASYNC_GETINQUECOUNT,
+                        0,0,0,
+                        &qInfo,ulLen,&ulLen);
+  dprintf(("ASYNC_GETINQUECOUNT -> qInfo.cch %d (queue size %d) rc %d", qInfo.cch, qInfo.cb, rc));
+
   ret = OSLibDosRead(pHMHandleData->hHMHandle, (LPVOID)lpBuffer, nNumberOfBytesToRead,
                      &ulBytesRead);
@@ -417 +426 @@
   if(lpNumberOfBytesRead) {
        *lpNumberOfBytesRead = (ret) ? ulBytesRead : 0;
-       dprintf2(("KERNEL32:HMDeviceCommClass::ReadFile %d bytes read", ulBytesRead));
+       dprintf2(("KERNEL32:HMDeviceCommClass::ReadFile %d bytes read", *lpNumberOfBytesRead));
   }
   if(ret == FALSE) {
@@ -617 +626 @@
           DosSleep(TIMEOUT_COMM);
       }
+      if(pDevData->fClosing) {
+          dprintf(("Cleaning up async comm thread"));
+          SetEvent(hEvent); //signal to CloseHandle that we're done
+          return 0;
+      }
+      else
+      if(pDevData->fCancelIo) {
+          pDevData->overlapped.Internal = 0;
+          pDevData->dwLastError = ERROR_OPERATION_ABORTED;
+          if(pDevData->lpfdwEvtMask) *pDevData->lpfdwEvtMask = 0;
+          dprintf(("Overlapped: WaitCommEvent ERROR_OPERATION_ABORTED"));
+
+          //signal to app that a comm event has occurred
+          SetEvent(hOverlappedEvent);
+      }
+      else
       if((dwEvent & dwMask) && (dwMask == pDevData->dwEventMask)) {
           pDevData->overlapped.Internal |= (rc==0) ? (dwEvent & dwMask) : 0;
@@ -876 +901 @@
                                    DWORD fdwAction)
 {
-  dprintf(("HMDeviceCommClass::PurgeComm (flags 0x%x) unimplemented stub!",fdwAction));
+  ULONG ulParLen, ulDataLen, rc = ERROR_SUCCESS;
+  BYTE par  = 0;
+  WORD data = 0;
+
+  dprintf(("HMDeviceCommClass::PurgeComm (flags 0x%x) partly implemented",fdwAction));
   // ToDo: find a way to stop the current transmision didn't find
   // any clue how to in Control Program Guide and reference
 
-  return(TRUE);
+  ulParLen  = sizeof(par);
+  ulDataLen = sizeof(data);
+  if(fdwAction & PURGE_TXCLEAR) {
+    rc = OSLibDosDevIOCtl( pHMHandleData->hHMHandle,
+                           IOCTL_GENERAL,
+                           DEV_FLUSHOUTPUT,
+                           &par,ulParLen,&ulParLen,
+                           &data,ulDataLen,&ulDataLen);
+  }
+  if(fdwAction & PURGE_RXCLEAR) {
+    rc = OSLibDosDevIOCtl( pHMHandleData->hHMHandle,
+                           IOCTL_GENERAL,
+                           DEV_FLUSHINPUT,
+                           &par,ulParLen,&ulParLen,
+                           &data,ulDataLen,&ulDataLen);
+  }
+  if(rc) {
+      dprintf(("!WARNING! OSLibDosDevIOCtl failed with rc %d", rc)); 
+  }
+  return (rc == ERROR_SUCCESS);
 }
 //******************************************************************************

tags/trunk/src/kernel32/hmcomm.h ¶

@@ -1 @@
-/* $Id: hmcomm.h,v 1.10 2001-11-28 15:35:15 sandervl Exp $ */
+/* $Id: hmcomm.h,v 1.11 2001-11-30 13:52:32 sandervl Exp $ */
 
 /*
@@ -40 +40 @@
 #define ASYNC_STOPTRANSMIT   0x47
 #define ASYNC_GETMODEMOUTPUT 0x66
+
+#define IOCTL_GENERAL        0x0B
+#define DEV_FLUSHINPUT       0x01
+#define DEV_FLUSHOUTPUT      0x02