[Com0com-cvs] hub4com hub4com.cpp,1.9,1.10 plugins.cpp,1.1,1.2

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

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

Modified Files:
	hub4com.cpp plugins.cpp 
Log Message:
Renamed option --use-port-module to --use-driver


Index: plugins.cpp
===================================================================
RCS file: /cvsroot/com0com/hub4com/plugins.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugins.cpp	26 Mar 2008 08:36:25 -0000	1.1
--- plugins.cpp	14 Apr 2008 07:32:03 -0000	1.2
***************
*** 20,27 ****
   *
   * $Log$
   * Revision 1.1  2008/03/26 08:36:25  vfrolov
   * Initial revision
   *
-  *
   */
  
--- 20,29 ----
   *
   * $Log$
+  * Revision 1.2  2008/04/14 07:32:03  vfrolov
+  * Renamed option --use-port-module to --use-driver
+  *
   * Revision 1.1  2008/03/26 08:36:25  vfrolov
   * Initial revision
   *
   */
  
***************
*** 111,115 ****
    switch (type) {
      case PLUGIN_TYPE_FILTER: str << "filter"; break;
!     case PLUGIN_TYPE_PORT:   str << "port";   break;
      default:                 str << type;
    }
--- 113,117 ----
    switch (type) {
      case PLUGIN_TYPE_FILTER: str << "filter"; break;
!     case PLUGIN_TYPE_DRIVER: str << "driver"; break;
      default:                 str << type;
    }
***************
*** 374,379 ****
              cerr << "-----------------------------" << endl;
  
-           cerr << "Type:        " << type2str(iPair->first) << endl;
            cerr << "Name:        " << (*i)->Name() << endl;
            cerr << "Copyright:   " << (*i)->Copyright() << endl;
            cerr << "License:     " << (*i)->License() << endl;
--- 376,381 ----
              cerr << "-----------------------------" << endl;
  
            cerr << "Name:        " << (*i)->Name() << endl;
+           cerr << "Type:        " << type2str(iPair->first) << endl;
            cerr << "Copyright:   " << (*i)->Copyright() << endl;
            cerr << "License:     " << (*i)->License() << endl;

Index: hub4com.cpp
===================================================================
RCS file: /cvsroot/com0com/hub4com/hub4com.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** hub4com.cpp	28 Mar 2008 15:53:48 -0000	1.9
--- hub4com.cpp	14 Apr 2008 07:32:03 -0000	1.10
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.10  2008/04/14 07:32:03  vfrolov
+  * Renamed option --use-port-module to --use-driver
+  *
   * Revision 1.9  2008/03/28 15:53:48  vfrolov
   * Fixed help
***************
*** 93,100 ****
    << "Filter options:" << endl
    << "  --create-filter=<MID>[,<FID>][:<Args>]" << endl
!   << "                           - by using module with type 'filter' and with name" << endl
!   << "                             <MID> create a filter with name <FID> (<FID> is" << endl
!   << "                             <MID> by default) and put arguments <Args> (if" << endl
!   << "                             any) to the filter." << endl
    << "  --add-filters=<Lst>:<LstF>" << endl
    << "                           - attach the filters listed in <LstF> to the ports" << endl
--- 96,102 ----
    << "Filter options:" << endl
    << "  --create-filter=<MID>[,<FID>][:<Args>]" << endl
!   << "                           - by using filter module with name <MID> create a" << endl
!   << "                             filter with name <FID> (<FID> is <MID> by default)" << endl
!   << "                             and put arguments <Args> (if any) to the filter." << endl
    << "  --add-filters=<Lst>:<LstF>" << endl
    << "                           - attach the filters listed in <LstF> to the ports" << endl
***************
*** 109,115 ****
    << endl
    << "Port options:" << endl
!   << "  --use-port-module=<MID>  - use module with type 'port' and with name <MID> to" << endl
!   << "                             create the following ports (<MID> is serial by" << endl
!   << "                             default)." << endl
    << endl
    << "The syntax of <LstR>, <LstL> and <Lst> above is <P1>[,<P2>...], where <Pn> is a" << endl
--- 111,116 ----
    << endl
    << "Port options:" << endl
!   << "  --use-driver=<MID>       - use driver module with name <MID> to create the" << endl
!   << "                             following ports (<MID> is serial by default)." << endl
    << endl
    << "The syntax of <LstR>, <LstL> and <Lst> above is <P1>[,<P2>...], where <Pn> is a" << endl
***************
*** 375,379 ****
    PortNumMap routeFlowControlMap;
  
!   const char *pUsePortModule = "serial";
  
    for (vector<string>::const_iterator i = args.begin() ; i != args.end() ; i++) {
--- 376,380 ----
    PortNumMap routeFlowControlMap;
  
!   const char *pUseDriver = "serial";
  
    for (vector<string>::const_iterator i = args.begin() ; i != args.end() ; i++) {
***************
*** 385,392 ****
  
        const PORT_ROUTINES_A *pPortRoutines =
!           (const PORT_ROUTINES_A *)pPlugins->GetRoutines(PLUGIN_TYPE_PORT, pUsePortModule, &hConfig);
  
        if (!pPortRoutines) {
!         cerr << "No port module " << pUsePortModule << endl;
          exit(1);
        }
--- 386,393 ----
  
        const PORT_ROUTINES_A *pPortRoutines =
!           (const PORT_ROUTINES_A *)pPlugins->GetRoutines(PLUGIN_TYPE_DRIVER, pUseDriver, &hConfig);
  
        if (!pPortRoutines) {
!         cerr << "No driver " << pUseDriver << endl;
          exit(1);
        }
***************
*** 455,460 ****
        AddFilters(hub, *pFilters, pParam);
      } else
!     if ((pParam = GetParam(pArg, "use-port-module=")) != NULL) {
!       pUsePortModule = pParam;
      } else {
        if (!ok) {
--- 456,461 ----
        AddFilters(hub, *pFilters, pParam);
      } else
!     if ((pParam = GetParam(pArg, "use-driver=")) != NULL) {
!       pUseDriver = pParam;
      } else {
        if (!ok) {