#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
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 =
\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
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
\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
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
}\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
\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
{\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
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
#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
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