[Com0com-cvs] com0com/sys trace.c,1.29,1.30

[Vyacheslav F. <vf...@us...>]

Update of /cvsroot/com0com/com0com/sys
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10365

Modified Files:
	trace.c 
Log Message:
Implemented ability to set individual pins with extended
IOCTL_SERIAL_SET_MODEM_CONTROL and IOCTL_SERIAL_GET_MODEM_CONTROL



Index: trace.c
===================================================================
RCS file: /cvsroot/com0com/com0com/sys/trace.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** trace.c	14 Mar 2008 15:28:39 -0000	1.29
--- trace.c	8 Apr 2008 10:37:56 -0000	1.30
***************
*** 20,23 ****
--- 20,27 ----
   *
   * $Log$
+  * Revision 1.30  2008/04/08 10:37:56  vfrolov
+  * Implemented ability to set individual pins with extended
+  * IOCTL_SERIAL_SET_MODEM_CONTROL and IOCTL_SERIAL_GET_MODEM_CONTROL
+  *
   * Revision 1.29  2008/03/14 15:28:39  vfrolov
   * Implemented ability to get paired port settings with
***************
*** 1423,1432 ****
--- 1427,1457 ----
            }
            break;
+         case IOCTL_SERIAL_SET_MODEM_CONTROL:
+           if ((flags & TRACE_FLAG_PARAMS) && inLength >= sizeof(ULONG)) {
+             pDestStr = AnsiStrCopyStr(pDestStr, &size, " ");
+             pDestStr = AnsiStrCopyMask(pDestStr, &size,
+                 codeNameTableModemControl, *((PULONG)pSysBuf));
+ 
+             if (inLength > sizeof(ULONG)) {
+               pDestStr = AnsiStrCopyStr(pDestStr, &size, ", ");
+               pDestStr = AnsiStrCopyDump(pDestStr, &size, ((PUCHAR)pSysBuf) + sizeof(ULONG), inLength - sizeof(ULONG));
+             }
+           }
+           break;
          case IOCTL_SERIAL_GET_MODEM_CONTROL:
          case IOCTL_SERIAL_GET_DTRRTS:
+           if ((flags & TRACE_FLAG_PARAMS) && inLength) {
+             pDestStr = AnsiStrCopyStr(pDestStr, &size, " ");
+             pDestStr = AnsiStrCopyDump(pDestStr, &size, pSysBuf, inLength);
+           }
            if ((flags & TRACE_FLAG_RESULTS) && inform >= sizeof(ULONG)) {
              pDestStr = AnsiStrCopyStr(pDestStr, &size, " ");
              pDestStr = AnsiStrCopyMask(pDestStr, &size,
                  codeNameTableModemControl, *((PULONG)pSysBuf));
+ 
+             if (inform > sizeof(ULONG)) {
+               pDestStr = AnsiStrCopyStr(pDestStr, &size, ", ");
+               pDestStr = AnsiStrCopyDump(pDestStr, &size, ((PUCHAR)pSysBuf) + sizeof(ULONG), inform - sizeof(ULONG));
+             }
            }
            break;
***************
*** 1513,1521 ****
            break;
          case IOCTL_SERIAL_LSRMST_INSERT:
!           if (flags & TRACE_FLAG_PARAMS) {
!             pDestStr = AnsiStrCopyStr(pDestStr, &size, " ");
!             pDestStr = AnsiStrCopyDump(pDestStr, &size, pSysBuf, inLength);
            }
!           if (flags & TRACE_FLAG_RESULTS) {
              pDestStr = AnsiStrCopyStr(pDestStr, &size, " ");
              pDestStr = AnsiStrCopyDump(pDestStr, &size, pSysBuf, inform);
--- 1538,1550 ----
            break;
          case IOCTL_SERIAL_LSRMST_INSERT:
!           if ((flags & TRACE_FLAG_PARAMS) && inLength >= sizeof(UCHAR)) {
!             pDestStr = AnsiStrFormat(pDestStr, &size, " escapeChar=0x%02X", (int)(*(PUCHAR)pSysBuf & 0xFF));
! 
!             if (inLength > sizeof(UCHAR)) {
!               pDestStr = AnsiStrCopyStr(pDestStr, &size, ", ");
!               pDestStr = AnsiStrCopyDump(pDestStr, &size, ((PUCHAR)pSysBuf) + sizeof(UCHAR), inLength - sizeof(UCHAR));
!             }
            }
!           if ((flags & TRACE_FLAG_RESULTS) && inform) {
              pDestStr = AnsiStrCopyStr(pDestStr, &size, " ");
              pDestStr = AnsiStrCopyDump(pDestStr, &size, pSysBuf, inform);