merge with WinIB stack to make the stacks as identical as possible

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

diff --git a/core/bus/kernel/bus_driver.c b/core/bus/kernel/bus_driver.c
index c1f8e78..685bf75 100644 (file)
--- a/core/bus/kernel/bus_driver.c
+++ b/core/bus/kernel/bus_driver.c
@@ -51,8 +51,11 @@
 #include "bus_driver.tmh"\r
 #endif\r
 \r
-\r
+#ifdef WINIB\r
+#define DEFAULT_NODE_DESC      "Mellanox Windows® Host"\r
+#else\r
 #define DEFAULT_NODE_DESC      "OpenIB Windows® Host"\r
+#endif\r
 \r
 \r
 char   node_desc[IB_NODE_DESCRIPTION_SIZE];\r

diff --git a/hw/mthca/kernel/mthca_qp.c b/hw/mthca/kernel/mthca_qp.c
index 0326def..1f932a1 100644 (file)
--- a/hw/mthca/kernel/mthca_qp.c
+++ b/hw/mthca/kernel/mthca_qp.c
@@ -1998,7 +1998,7 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct _ib_send_wr *wr,
 
                                wqe += sizeof (struct mthca_raddr_seg);
 
-                               if (opcode == MTHCA_OPCODE_ATOMIC_FA) {
+                               if (opcode == MTHCA_OPCODE_ATOMIC_CS) {
                                        ((struct mthca_atomic_seg *) wqe)->swap_add =
                                                cl_hton64(wr->remote_ops.atomic2);
                                        ((struct mthca_atomic_seg *) wqe)->compare =

diff --git a/inc/openib.def b/inc/openib.def
index acf8877..04b34c9 100644 (file)
--- a/inc/openib.def
+++ b/inc/openib.def
@@ -24,11 +24,17 @@ IB_FILEBUILD=0
 \r
 !IF !DEFINED(IB_FILEREV)\r
 IB_FILEREV=$(OPENIB_REV)\r
+\r
 !endif\r
 \r
+!IFNDEF VER_PROVIDER\r
+VER_PROVIDER="""OpenIB"""\r
+!ENDIF\r
+\r
 C_DEFINES=$(C_DEFINES) -DIB_COMPANYNAME=$(IB_COMPANYNAME) \\r
     -DIB_PRODUCTNAME=$(IB_PRODUCTNAME) \\r
     -DVER_FILEMAJORVERSION=$(IB_MAJORVERSION) \\r
     -DVER_FILEMINORVERSION=$(IB_MINORVERSION) \\r
     -DVER_FILEBUILD=$(IB_FILEBUILD) \\r
-    -DVER_FILEREV=$(IB_FILEREV)\r
+       -DVER_FILEREV=$(IB_FILEREV) \\r
+       -DVER_PROVIDER=$(VER_PROVIDER)
\ No newline at end of file

diff --git a/tools/coinstaller/user/IBInstaller.rc b/tools/coinstaller/user/IBInstaller.rc
index 572cbfb..17bb464 100644 (file)
--- a/tools/coinstaller/user/IBInstaller.rc
+++ b/tools/coinstaller/user/IBInstaller.rc
@@ -99,7 +99,11 @@ BEGIN
     BEGIN\r
         BLOCK "040904b0"\r
         BEGIN\r
-            VALUE "CompanyName", "SilverStorm Technologies, Inc."\r
+#ifdef WINIB\r
+            VALUE "CompanyName", "Mellanox Technologies, Inc."\r
+#else\r
+                       VALUE "CompanyName", "OpenFabrics Alliance"\r
+#endif\r
             VALUE "FileDescription", "InfiniBand HCA Class Co-installer"\r
             VALUE "FileVersion", "1, 0, 0, 0"\r
             VALUE "InternalName", "IbInstaller"\r

diff --git a/tools/coinstaller/user/IbInstaller.cpp b/tools/coinstaller/user/IbInstaller.cpp
index 7844bdc..87f5939 100644 (file)
--- a/tools/coinstaller/user/IbInstaller.cpp
+++ b/tools/coinstaller/user/IbInstaller.cpp
@@ -39,8 +39,11 @@ wchar_t  debug_buf[256];
 \r
 // IB Fabric device HW ID\r
 #define GUID_IB_BUS_HW_ID      TEXT("{94f41ced-78eb-407c-b5df-958040af0fd8}")\r
-\r
+#ifdef WINIB \r
+#define DEVICE_DESC                    TEXT("Mellanox InfiniBand Fabric")\r
+#else\r
 #define DEVICE_DESC                    TEXT("InfiniBand Fabric")\r
+#endif\r
 \r
 // System Class GUID (from wdmguid.h)\r
 //{4D36E97D-E325-11CE-BFC1-08002BE10318}\r
@@ -163,8 +166,8 @@ DWORD SelectDriver(
                        OutputDebugString( debug_buf );\r
                        break;\r
                }\r
-\r
                // make the string\r
+\r
                swprintf( debug_buf,TEXT("[IbInstaller]  pDrvInfo->Description %s\n"),pDrvInfo->Description);\r
                OutputDebugString( debug_buf );\r
                \r
@@ -280,7 +283,7 @@ CreateIbBusRoot(
                        }\r
                        driverPath[nEnd+1] = _T('\0');            \r
 \r
-       _tcsncpy( installParams.DriverPath, driverPath, MAX_PATH );\r
+                       _tcsncpy( installParams.DriverPath, driverPath, MAX_PATH );\r
                        _tcsncat(installParams.DriverPath, FindFileData.cFileName, MAX_PATH);\r
                        FindClose(hFind);\r
                }\r

diff --git a/tools/wsdinstall/user/installsp.c b/tools/wsdinstall/user/installsp.c
index a13bf39..5598404 100644 (file)
--- a/tools/wsdinstall/user/installsp.c
+++ b/tools/wsdinstall/user/installsp.c
@@ -45,10 +45,10 @@
 \r
 /* Initialize the LSP's provider path for Infiband Service Provider dll */\r
 static const WCHAR provider_path[] = L"%SYSTEMROOT%\\system32\\ibwsd.dll";\r
-static const WCHAR provider_name[] = L"OpenIB Winsock Direct for InfiniBand";\r
+static const WCHAR provider_name[] = L"%VER_PROVIDER% Winsock Direct for InfiniBand"; //(VER_PROVIDER ## WINDIR);\r
 static const char winsock_key_path[] =\r
        "System\\CurrentControlSet\\Services\\Winsock\\Parameters\\TCP on SAN";\r
-static const char openib_key_name[] = "OpenIB Alliance";\r
+static const char openib_key_name[] = "%IB_COMPANYNAME%";\r
 \r
 /* Unique provider GUID generated with "uuidgen -s" */\r
 static GUID provider_guid = {\r
@@ -485,9 +485,9 @@ usage (char *progname)
 {\r
        printf ("usage: %s [-i/-r [-p]]\n", progname);\r
        printf ("    -i   Install the service provider\n"\r
-                       "    -r   Remove the OpenIB service provider\n"\r
+                       "    -r   Remove the %s service provider\n"\r
                        "    -r <name>   Remove the specified service provider\n"\r
-                       "    -l   List service providers\n");\r
+                       "    -l   List service providers\n",VER_PROVIDER);\r
 }\r
 \r
 \r

diff --git a/ulp/dapl/test/udapl/dapltest/SOURCES b/ulp/dapl/test/udapl/dapltest/SOURCES
index ffab1eb..4c56327 100644 (file)
--- a/ulp/dapl/test/udapl/dapltest/SOURCES
+++ b/ulp/dapl/test/udapl/dapltest/SOURCES
@@ -2,7 +2,7 @@ TARGETNAME=dapltest
 TARGETPATH=..\..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r
-USE_CRTDLL=1\r
+USE_MSVCRT=1\r
 \r
 SOURCES=dapltest.rc \\r
        dapl_bpool.c    \\r

diff --git a/ulp/wsd/user/ibsp_duplicate.c b/ulp/wsd/user/ibsp_duplicate.c
index 8cac6ba..ffd441d 100644 (file)
--- a/ulp/wsd/user/ibsp_duplicate.c
+++ b/ulp/wsd/user/ibsp_duplicate.c
@@ -40,6 +40,7 @@
 #include "ibspdll.h"\r
 #include "rpc.h"\r
 \r
+\r
 /* \r
 http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dllproc/base/using_shared_memory_in_a_dynamic_link_library.asp\r
 */\r
@@ -51,9 +52,9 @@ create_name(
        IN              const   DWORD                                           dwProcessId,\r
        IN              const   GUID                                            *p_guid )\r
 {\r
-       sprintf( fname, "Global\\OpenIB-WSD-%08lx-"\r
+       sprintf( fname, "Global\\%s-WSD-%08lx-"\r
                "%08lx-%04hx-%04hx-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x",\r
-               dwProcessId, p_guid->Data1, p_guid->Data2, p_guid->Data3,\r
+               VER_PROVIDER, dwProcessId, p_guid->Data1, p_guid->Data2, p_guid->Data3,\r
                (int)p_guid->Data4[0], (int)p_guid->Data4[1],\r
                (int)p_guid->Data4[2], (int)p_guid->Data4[3],\r
                (int)p_guid->Data4[4], (int)p_guid->Data4[5],\r