[WinOF/DAPL2] reflect WinOF now installs into %ProgramFiles% on all systems, not...

Move Dat/Dapl 1.1 providers to the end of the list for those MPIs which use the 1st available provider; ends up defaulting to DAT/DAPL V2.0. Thus begins the phasing out of DAT/DAPL 1.1 support.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2434 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/WinOF/WIX/dat.conf b/trunk/WinOF/WIX/dat.conf
index a95d2fffdb91d34e4e5be7c2ae4dba872e1c8e3e..b8419f2a09fe4ea5ab23cc0f959cbbe96a13d7a8 100644 (file)
--- a/trunk/WinOF/WIX/dat.conf
+++ b/trunk/WinOF/WIX/dat.conf
@@ -9,32 +9,31 @@
 # <DAPL-Interface-name> <api_version> <threadsafety> <default> <dapl_lib_path> \\r
 #           <provider_version> <ia_device_params> <platform_params>\r
 #\r
+# DAT v1.1 dapl provider configuration for HCA0 port 1\r
+ibnic0 u1.1 threadsafe default C:\Windows\dapl.dll ri.1.1 "IbalHca0 1" ""\r
+IbalHca0 u1.1 threadsafe default C:\Windows\dapl.dll ri.1.1 "IbalHca0 1" ""\r
+#\r
+# DAT 1.1 debug\r
+ibnic0d u1.1 threadsafe default "C:\\Program Files\\WinOF\\dapld.dll" ri.1.1 "IbalHca0 1" ""\r
+#\r
 # DAT 2.0\r
 ibnic0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" ""\r
 ibnic1v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca1 1" ""\r
 IbalHca0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" ""\r
 #\r
 # DAT 2.0 (debug)\r
-ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files (x86)\\WinOF\\dapl2d.dll" ri.2.0 "IbalHca0 1" ""\r
+ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2d.dll" ri.2.0 "IbalHca0 1" ""\r
 #\r
 # DAT 2.0 [socket-cm] InfiniBand QPs setup by passing QP info over a socket\r
 # connection; supports DAT Windows <==> Linux over IB connections.\r
 ibnic0v2-scm u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-scm.dll ri.2.0 "ibv_device0 1" ""\r
 #\r
 # Socket-CM (debug)\r
-ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files (x86)\\WinOF\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" ""\r
+ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" ""\r
 #\r
 # DAT 2.0 RDMA-CM\r
 # connection; supports DAT Windows <==> Linux over IB connections.\r
 ibnic0v2-cma u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-cma.dll ri.2.0 "rdma_dev0 1" ""\r
 #\r
 # DAT 2.0 RDMA-CM (debug)\r
-ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files (x86)\\WinOF\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" ""\r
-#\r
-# DAT v1.1 dapl provider configuration for HCA0 port 1\r
-ibnic0 u1.1 threadsafe default C:\Windows\dapl.dll ri.1.1 "IbalHca0 1" ""\r
-IbalHca0 u1.1 threadsafe default C:\Windows\dapl.dll ri.1.1 "IbalHca0 1" ""\r
-#\r
-# DAT 1.1 debug\r
-ibnic0d u1.1 threadsafe default "C:\\Program Files (x86)\\WinOF\\dapld.dll" ri.1.1 "IbalHca0 1" ""\r
-#
\ No newline at end of file
+ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" ""\r