Merge branch 'master' of pwrcvs:/data1/git/pwr

src/wbl/pwrb/src/pwrb_c_busconfig.wb_load

@@ -93,6 +93,17 @@ SObject pwrb:Class
           Attr TypeRef = "pwrs:Type-$UInt32"
         EndBody
       EndObject
+      !/**
+      !  Disable the QCom auto connect. The nodes in the project
+      !  will not automatically create QCom links between each other.
+      !  These links can be configured individually for each node with 
+      !  FriendNode objects.
+      !*/
+      Object QComAutoConnectDisable $Attribute 3
+        Body SysBody
+          Attr TypeRef = "pwrb:Type-YesNoEnum"
+        EndBody
+      EndObject
     EndObject
   EndObject
 EndSObject

wb/lib/wb/src/wb_lfu.cpp

@@ -702,6 +702,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
   int           path_file_created = 0;
   pwr_tString80 custom_platform;
   pwr_mOpSys   	custom_os;
+  pwr_tEnum  	qcom_auto_dis = 0;
 
   syntax_error = 0;
   strcpy( null_nodename, "-");
@@ -1457,6 +1458,12 @@ pwr_tStatus lfu_SaveDirectoryVolume(
     if ( bus_number == 0) 
       continue;
 
+    a = sp->attribute( buso.oid(), "RtBody", "QComAutoConnectDisable");
+    if ( !a) return a.sts();
+
+    a.value( &qcom_auto_dis);
+    if ( !a) return a.sts();
+
     // Get all nodeconfig and friendnodes for this bus
     vector<lfu_nodeconf> nodevect;
     int node_cnt = 0;
@@ -1685,6 +1692,10 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 
 	for ( int i = 0; i < (int)nodevect.size(); i++) {
 	  lfu_nodeconf nc = nodevect[i];
+
+	  if ( qcom_auto_dis == pwr_eYesNoEnum_Yes && i != idx)
+	    continue;
+
 	  fprintf( fp, "%s %s %s %d %d %d %d\n", nc.nodename, 
 		   cdh_VolumeIdToString( NULL, nc.vid, 0, 0), nc.address, nc.port, 
 		   nc.connection, int(nc.qcom_min_resend_time * 1000), 

xtt/lib/xtt/src/xtt_xnav_tables.cpp

@@ -986,7 +986,7 @@ static void xnav_channel_get_flags( void *cardp, void *chanp,
       pwr_sClass_ChanDo *cp = (pwr_sClass_ChanDo *)chanp;
 
       *inv = cp->InvertOn;
-      *conv = 0;
+      *conv = 1;
       *teston = cp->TestOn;
       break;
     }