[WinOF] All installs now install into 'Program Files' and not 'Program Files (x86...

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

diff --git a/trunk/WinOF/BuildRelease.bat b/trunk/WinOF/BuildRelease.bat
index 1b97fee18a572498166a38c1e19548daba9a8639..8d3b93fb23787ba6b3c8eb062ca8033c708075c9 100644 (file)
--- a/trunk/WinOF/BuildRelease.bat
+++ b/trunk/WinOF/BuildRelease.bat
@@ -160,7 +160,7 @@ rem Use this WDK
 \r
 if "%WIN7%" == "yes" (\r
        rem Windows 7 WDK\r
-       set _DDK_VER=7100.0.0\r
+       set _DDK_VER=7600.16385.0\r
        set _COIN_VER=01009\r
 ) else (\r
        rem Server 2008 WDK & WdfCoInstaller version\r

diff --git a/trunk/WinOF/WIX/dat.conf b/trunk/WinOF/WIX/dat.conf
index 3dfce3a98352f589b148c895af60d7547ed3806e..a95d2fffdb91d34e4e5be7c2ae4dba872e1c8e3e 100644 (file)
--- a/trunk/WinOF/WIX/dat.conf
+++ b/trunk/WinOF/WIX/dat.conf
@@ -9,13 +9,6 @@
 # <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 (x86)\\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
@@ -37,3 +30,11 @@ ibnic0v2-cma u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-cma.dll ri.2.0 "rdm
 #\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

diff --git a/trunk/ulp/dapl2/test/dapltest/mdep/linux/dapl_mdep_user.h b/trunk/ulp/dapl2/test/dapltest/mdep/linux/dapl_mdep_user.h
index c39d3d69dcbfd82728f44c05573d171a26b67fc0..5e92720552322c13473a51a2d7aab2fc19845c43 100644 (file)
--- a/trunk/ulp/dapl2/test/dapltest/mdep/linux/dapl_mdep_user.h
+++ b/trunk/ulp/dapl2/test/dapltest/mdep/linux/dapl_mdep_user.h
@@ -200,4 +200,9 @@ do { \
 
 #define DT_Mdep_flush() fflush(NULL)
 
+/*
+ * Release processor to reschedule
+ */
+#define DT_Mdep_yield pthread_yield()
+
 #endif

diff --git a/trunk/ulp/dapl2/test/dapltest/mdep/windows/dapl_mdep_user.h b/trunk/ulp/dapl2/test/dapltest/mdep/windows/dapl_mdep_user.h
index 7b7a845c3e6e4ae63572fe5ce3eba16a895b9533..dffbd9b2b9f689e78df553ebb99cb5248efc70ae 100644 (file)
--- a/trunk/ulp/dapl2/test/dapltest/mdep/windows/dapl_mdep_user.h
+++ b/trunk/ulp/dapl2/test/dapltest/mdep/windows/dapl_mdep_user.h
@@ -79,6 +79,11 @@ do { \
 #define DT_Mdep_printf printf
 #define DT_Mdep_flush() fflush(NULL)
 
+/*
+ * Release processor to reschedule
+ */
+#define DT_Mdep_yield Sleep(0)
+
 /*
  * Locks
  */

diff --git a/trunk/ulp/dapl2/test/dapltest/test/dapl_test_util.c b/trunk/ulp/dapl2/test/dapltest/test/dapl_test_util.c
index db9b672132b9a296ec5029a8afb4fd97f9418811..2b78b9d5b4c5e5dc43766718c9de204a085f1b81 100644 (file)
--- a/trunk/ulp/dapl2/test/dapltest/test/dapl_test_util.c
+++ b/trunk/ulp/dapl2/test/dapltest/test/dapl_test_util.c
@@ -415,7 +415,7 @@ DT_dto_event_poll(DT_Tdep_Print_Head * phead,
                  DAT_EVD_HANDLE evd_handle,
                  DAT_DTO_COMPLETION_EVENT_DATA * dto_statusp)
 {
-       for (;;) {
+       for (;;DT_Mdep_yield) {
                DAT_RETURN ret;
                DAT_EVENT event;