Update of /cvsroot/com0com/hub4com/plugins/pinmap
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7231/pinmap
Modified Files:
filter.cpp
Log Message:
Added
HUB_MSG_TYPE_GET_ESC_OPTS
HUB_MSG_TYPE_FAIL_ESC_OPTS
HUB_MSG_TYPE_BREAK_STATUS
Index: filter.cpp
===================================================================
RCS file: /cvsroot/com0com/hub4com/plugins/pinmap/filter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** filter.cpp 22 Aug 2008 12:45:34 -0000 1.5
--- filter.cpp 22 Aug 2008 16:57:11 -0000 1.6
***************
*** 20,23 ****
--- 20,29 ----
*
* $Log$
+ * Revision 1.6 2008/08/22 16:57:11 vfrolov
+ * Added
+ * HUB_MSG_TYPE_GET_ESC_OPTS
+ * HUB_MSG_TYPE_FAIL_ESC_OPTS
+ * HUB_MSG_TYPE_BREAK_STATUS
+ *
* Revision 1.5 2008/08/22 12:45:34 vfrolov
* Added masking to HUB_MSG_TYPE_MODEM_STATUS and HUB_MSG_TYPE_LINE_STATUS
***************
*** 75,83 ****
};
///////////////////////////////////////////////////////////////
#define MST2LSRMST(m) ((WORD)((BYTE)(m)))
#define LSR2LSRMST(l) ((WORD)(((WORD)(BYTE)(l)) << 8))
#define LSRMST2MST(lm) ((BYTE)(lm))
#define LSRMST2LSR(lm) ((BYTE)((lm) >> 8))
! #define LSRMST2GO(lm) (GO_V2O_MODEM_STATUS(LSRMST2MST(lm)) | GO_V2O_LINE_STATUS(LSRMST2LSR(lm)))
static struct {
--- 81,91 ----
};
///////////////////////////////////////////////////////////////
+ #define LSR_BREAK_STATUS 0x01
+
#define MST2LSRMST(m) ((WORD)((BYTE)(m)))
#define LSR2LSRMST(l) ((WORD)(((WORD)(BYTE)(l)) << 8))
#define LSRMST2MST(lm) ((BYTE)(lm))
#define LSRMST2LSR(lm) ((BYTE)((lm) >> 8))
! #define LSRMST2GO(lm) (GO_V2O_MODEM_STATUS(LSRMST2MST(lm)) | ((LSRMST2LSR(lm) & LSR_BREAK_STATUS) ? GO_BREAK_STATUS : 0))
static struct {
***************
*** 89,93 ****
{"dcd", MST2LSRMST(MODEM_STATUS_DCD)},
{"ring", MST2LSRMST(MODEM_STATUS_RI)},
! {"break", LSR2LSRMST(LINE_STATUS_BI)},
};
///////////////////////////////////////////////////////////////
--- 97,101 ----
{"dcd", MST2LSRMST(MODEM_STATUS_DCD)},
{"ring", MST2LSRMST(MODEM_STATUS_RI)},
! {"break", LSR2LSRMST(LSR_BREAK_STATUS)},
};
///////////////////////////////////////////////////////////////
***************
*** 394,398 ****
pOutMsg->u.val &= ~(VAL2MASK(((Filter *)hFilter)->outMask));
break;
! case HUB_MSG_TYPE_LINE_STATUS:
case HUB_MSG_TYPE_MODEM_STATUS: {
State *pState = ((Filter *)hFilter)->GetState(nToPort);
--- 402,406 ----
pOutMsg->u.val &= ~(VAL2MASK(((Filter *)hFilter)->outMask));
break;
! case HUB_MSG_TYPE_BREAK_STATUS:
case HUB_MSG_TYPE_MODEM_STATUS: {
State *pState = ((Filter *)hFilter)->GetState(nToPort);
***************
*** 408,413 ****
lmInMask = MST2LSRMST(MASK2VAL(pOutMsg->u.val));
} else {
! lmInVal = LSR2LSRMST(pOutMsg->u.val);
! lmInMask = LSR2LSRMST(MASK2VAL(pOutMsg->u.val));
}
--- 416,421 ----
lmInMask = MST2LSRMST(MASK2VAL(pOutMsg->u.val));
} else {
! lmInVal = (pOutMsg->u.val ? LSR2LSRMST(LSR_BREAK_STATUS) : 0);
! lmInMask = LSR2LSRMST(LSR_BREAK_STATUS);
}
|
