[Com0com-cvs] hub4com comhub.cpp, 1.12, 1.13 comhub.h, 1.9, 1.10 export.cpp, 1.6, 1.7

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

Update of /cvsroot/com0com/hub4com
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1198

Modified Files:
	comhub.cpp comhub.h export.cpp 
Log Message:
Removed pOnXoffXon


Index: export.cpp
===================================================================
RCS file: /cvsroot/com0com/hub4com/export.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** export.cpp	24 Nov 2008 12:46:16 -0000	1.6
--- export.cpp	24 Nov 2008 16:30:56 -0000	1.7
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.7  2008/11/24 16:30:56  vfrolov
+  * Removed pOnXoffXon
+  *
   * Revision 1.6  2008/11/24 12:46:16  vfrolov
   * Changed plugin API
***************
*** 203,214 ****
  }
  ///////////////////////////////////////////////////////////////
- static void CALLBACK on_xoff_xon(HMASTERPORT hMasterPort, BOOL xoff)
- {
-   _ASSERTE(hMasterPort != NULL);
-   _ASSERTE(((Port *)hMasterPort)->IsValid());
- 
-   ((Port *)hMasterPort)->hub.AddXoffXon((Port *)hMasterPort, xoff);
- }
- ///////////////////////////////////////////////////////////////
  static void CALLBACK on_read(HMASTERPORT hMasterPort, HUB_MSG *pMsg)
  {
--- 206,209 ----
***************
*** 236,240 ****
    port_name,
    filter_name,
-   on_xoff_xon,
    on_read,
  };
--- 231,234 ----

Index: comhub.h
===================================================================
RCS file: /cvsroot/com0com/hub4com/comhub.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** comhub.h	24 Nov 2008 12:36:59 -0000	1.9
--- comhub.h	24 Nov 2008 16:30:56 -0000	1.10
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.10  2008/11/24 16:30:56  vfrolov
+  * Removed pOnXoffXon
+  *
   * Revision 1.9  2008/11/24 12:36:59  vfrolov
   * Changed plugin API
***************
*** 87,91 ****
      BOOL OnFakeRead(Port *pFromPort, HubMsg *pMsg) const;
      void OnRead(Port *pFromPort, HubMsg *pMsg) const;
-     void AddXoffXon(Port *pFromPort, BOOL xoff) const;
      void LostReport() const;
      void SetDataRoute(const PortMap &map) { routeDataMap = map; }
--- 90,93 ----
***************
*** 108,113 ****
  
    private:
-     void OnRead(const PortMap &routeMap, Port *pFromPort, HubMsg *pMsg) const;
- 
      Ports ports;
      PortMap routeDataMap;
--- 110,113 ----

Index: comhub.cpp
===================================================================
RCS file: /cvsroot/com0com/hub4com/comhub.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** comhub.cpp	24 Nov 2008 12:36:59 -0000	1.12
--- comhub.cpp	24 Nov 2008 16:30:56 -0000	1.13
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.13  2008/11/24 16:30:56  vfrolov
+  * Removed pOnXoffXon
+  *
   * Revision 1.12  2008/11/24 12:36:59  vfrolov
   * Changed plugin API
***************
*** 177,195 ****
  void ComHub::OnRead(Port *pFromPort, HubMsg *pMsg) const
  {
-   OnRead(routeDataMap, pFromPort, pMsg);
- }
- 
- void ComHub::AddXoffXon(Port *pFromPort, BOOL xoff) const
- {
-   HubMsg msg;
- 
-   msg.type = HUB_MSG_TYPE_ADD_XOFF_XON;
-   msg.u.val = xoff;
- 
-   OnRead(routeFlowControlMap, pFromPort, &msg);
- }
- 
- void ComHub::OnRead(const PortMap &routeMap, Port *pFromPort, HubMsg *pMsg) const
- {
    _ASSERTE(pFromPort != NULL);
    _ASSERTE(pMsg != NULL);
--- 180,183 ----
***************
*** 212,215 ****
--- 200,205 ----
    }
  
+   const PortMap &routeMap = (pMsg->type & HUB_MSG_ROUTE_FLOW_CONTROL) ? routeFlowControlMap : routeDataMap;
+ 
    for (PortMap::const_iterator i = routeMap.find(pFromPort) ; i != routeMap.end() ; i++) {
      if (i->first != pFromPort)