From 4be6fb2ec309e6fa3384cfeb601d61172fb4e952 Mon Sep 17 00:00:00 2001 From: ftillier Date: Tue, 18 Oct 2005 22:03:10 +0000 Subject: [PATCH] OpenIB branding Signed-off-by: Fab Tillier (ftillier@silverstorm.com) git-svn-id: svn://openib.tc.cornell.edu/gen1@123 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/core/al/kernel/ibal.rc | 2 +- trunk/core/al/kernel/makefile | 4 +- trunk/core/al/user/ibal.rc | 2 +- trunk/core/al/user/makefile | 4 +- trunk/core/bus/kernel/ibbus.rc | 2 +- trunk/core/bus/kernel/makefile | 4 +- trunk/core/complib/kernel/SOURCES | 6 +- trunk/core/complib/kernel/complib.rc | 47 ----------- trunk/core/complib/user/complib.rc | 2 +- trunk/core/complib/user/makefile | 4 +- trunk/core/iou/kernel/ibiou.rc | 2 +- trunk/core/iou/kernel/makefile | 4 +- trunk/hw/mt23108/kernel/Makefile | 4 +- trunk/hw/mt23108/kernel/hca.rc | 2 +- trunk/hw/mt23108/user/Makefile | 4 +- trunk/hw/mt23108/user/uvpd.rc | 2 +- trunk/hw/mt23108/vapi/kernel/Makefile | 4 +- trunk/hw/mt23108/vapi/kernel/mt23108.rc | 2 +- trunk/inc/{ics_ver.h => oib_ver.h} | 10 +-- trunk/inc/openib.def | 3 + trunk/tests/alts/kernel/alts.rc | 2 +- trunk/tests/alts/kernel/makefile | 4 +- trunk/tests/alts/user/makefile | 4 +- trunk/tests/cmtest/user/makefile | 4 +- trunk/tools/coinstaller/user/makefile | 4 +- trunk/tools/vstat/dirs | 4 +- trunk/tools/vstat/user/makefile | 14 +-- trunk/tools/vstat/user/vstat.rc | 94 ++++++++++----------- trunk/tools/wsdinstall/user/installsp.c | 24 +++--- trunk/tools/wsdinstall/user/makefile | 4 +- trunk/ulp/dapl/dapl/udapl/makefile | 4 +- trunk/ulp/dapl/dat/udat/makefile | 4 +- trunk/ulp/dapl/test/udapl/dapltest/makefile | 4 +- trunk/ulp/dirs | 4 +- trunk/ulp/ipoib/kernel/ipoib.rc | 2 +- trunk/ulp/ipoib/kernel/makefile | 4 +- trunk/ulp/opensm/user/opensm/Makefile | 4 +- trunk/ulp/opensm/user/opensm/opensm.rc | 2 +- trunk/ulp/srp/dirs | 1 + trunk/ulp/srp/kernel/ibsrp.rc | 2 +- trunk/ulp/srp/kernel/makefile | 4 +- trunk/ulp/wsd/user/ibspdll.rc | 3 +- trunk/ulp/wsd/user/makefile | 4 +- 43 files changed, 137 insertions(+), 177 deletions(-) delete mode 100644 trunk/core/complib/kernel/complib.rc rename trunk/inc/{ics_ver.h => oib_ver.h} (86%) create mode 100644 trunk/inc/openib.def diff --git a/trunk/core/al/kernel/ibal.rc b/trunk/core/al/kernel/ibal.rc index 2f728352..608d6f38 100644 --- a/trunk/core/al/kernel/ibal.rc +++ b/trunk/core/al/kernel/ibal.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/core/al/kernel/makefile b/trunk/core/al/kernel/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/core/al/kernel/makefile +++ b/trunk/core/al/kernel/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/core/al/user/ibal.rc b/trunk/core/al/user/ibal.rc index daf1fe17..e2d86f5f 100644 --- a/trunk/core/al/user/ibal.rc +++ b/trunk/core/al/user/ibal.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DLL #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/core/al/user/makefile b/trunk/core/al/user/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/core/al/user/makefile +++ b/trunk/core/al/user/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/core/bus/kernel/ibbus.rc b/trunk/core/bus/kernel/ibbus.rc index b17aad08..a6b3ffd0 100644 --- a/trunk/core/bus/kernel/ibbus.rc +++ b/trunk/core/bus/kernel/ibbus.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/core/bus/kernel/makefile b/trunk/core/bus/kernel/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/core/bus/kernel/makefile +++ b/trunk/core/bus/kernel/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/core/complib/kernel/SOURCES b/trunk/core/complib/kernel/SOURCES index e1f602c7..dd385750 100644 --- a/trunk/core/complib/kernel/SOURCES +++ b/trunk/core/complib/kernel/SOURCES @@ -2,9 +2,7 @@ TARGETNAME=complib TARGETPATH=..\..\..\bin\kernel\obj$(BUILD_ALT_DIR) TARGETTYPE=DRIVER_LIBRARY -DLLDEF=cl_exports.def - -SOURCES= complib.rc \ +SOURCES= \ cl_driver.c \ cl_event.c \ cl_log.c \ @@ -29,6 +27,6 @@ SOURCES= complib.rc \ INCLUDES=..\..\..\inc;..\..\..\inc\kernel; -C_DEFINES=$(C_DEFINES) -DDRIVER -DEXPORT_CL_SYMBOLS -DDEPRECATE_DDK_FUNCTIONS +C_DEFINES=$(C_DEFINES) -DDRIVER -DDEPRECATE_DDK_FUNCTIONS MSC_WARNING_LEVEL= /W4 diff --git a/trunk/core/complib/kernel/complib.rc b/trunk/core/complib/kernel/complib.rc deleted file mode 100644 index 34cce2f0..00000000 --- a/trunk/core/complib/kernel/complib.rc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2005 SilverStorm Technologies. All rights reserved. - * - * This software is available to you under the OpenIB.org BSD license - * below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * $Id$ - */ - - -#include - -#define VER_FILETYPE VFT_DRV -#define VER_FILESUBTYPE VFT2_UNKNOWN - -#ifdef _DEBUG_ -#define VER_FILEDESCRIPTION_STR "Kernel Mode Component Library (Debug)" -#else -#define VER_FILEDESCRIPTION_STR "Kernel Mode Component Library" -#endif - -#define VER_INTERNALNAME_STR "complib.sys" -#define VER_ORIGINALFILENAME_STR "complib.sys" - -#include diff --git a/trunk/core/complib/user/complib.rc b/trunk/core/complib/user/complib.rc index d5abc53e..6237874c 100644 --- a/trunk/core/complib/user/complib.rc +++ b/trunk/core/complib/user/complib.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DLL #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/core/complib/user/makefile b/trunk/core/complib/user/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/core/complib/user/makefile +++ b/trunk/core/complib/user/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/core/iou/kernel/ibiou.rc b/trunk/core/iou/kernel/ibiou.rc index 21df4af1..56b995af 100644 --- a/trunk/core/iou/kernel/ibiou.rc +++ b/trunk/core/iou/kernel/ibiou.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/core/iou/kernel/makefile b/trunk/core/iou/kernel/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/core/iou/kernel/makefile +++ b/trunk/core/iou/kernel/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/hw/mt23108/kernel/Makefile b/trunk/hw/mt23108/kernel/Makefile index 9c985f57..bffacaa7 100644 --- a/trunk/hw/mt23108/kernel/Makefile +++ b/trunk/hw/mt23108/kernel/Makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/hw/mt23108/kernel/hca.rc b/trunk/hw/mt23108/kernel/hca.rc index 2bbccd01..9dfda9eb 100644 --- a/trunk/hw/mt23108/kernel/hca.rc +++ b/trunk/hw/mt23108/kernel/hca.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/hw/mt23108/user/Makefile b/trunk/hw/mt23108/user/Makefile index 9c985f57..bffacaa7 100644 --- a/trunk/hw/mt23108/user/Makefile +++ b/trunk/hw/mt23108/user/Makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/hw/mt23108/user/uvpd.rc b/trunk/hw/mt23108/user/uvpd.rc index 2bc4b440..a67b222a 100644 --- a/trunk/hw/mt23108/user/uvpd.rc +++ b/trunk/hw/mt23108/user/uvpd.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DLL #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/hw/mt23108/vapi/kernel/Makefile b/trunk/hw/mt23108/vapi/kernel/Makefile index 9c985f57..a0c06273 100644 --- a/trunk/hw/mt23108/vapi/kernel/Makefile +++ b/trunk/hw/mt23108/vapi/kernel/Makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\..\inc\openib.def diff --git a/trunk/hw/mt23108/vapi/kernel/mt23108.rc b/trunk/hw/mt23108/vapi/kernel/mt23108.rc index de37251b..63a513eb 100644 --- a/trunk/hw/mt23108/vapi/kernel/mt23108.rc +++ b/trunk/hw/mt23108/vapi/kernel/mt23108.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/inc/ics_ver.h b/trunk/inc/oib_ver.h similarity index 86% rename from trunk/inc/ics_ver.h rename to trunk/inc/oib_ver.h index 834667ec..7d3caf2b 100644 --- a/trunk/inc/ics_ver.h +++ b/trunk/inc/oib_ver.h @@ -34,7 +34,7 @@ #include #ifndef VER_FILEMAJORVERSION -#define VER_FILEMAJORVERSION 3 +#define VER_FILEMAJORVERSION 1 #endif #ifndef VER_FILEMINORVERSION @@ -42,7 +42,7 @@ #endif #ifndef VER_FILEBUILD -#define VER_FILEBUILD 36 +#define VER_FILEBUILD VER_OPENIB #endif #ifndef VER_FILEREV @@ -76,11 +76,11 @@ #ifdef VER_COMPANYNAME_STR #undef VER_COMPANYNAME_STR #endif -#define VER_COMPANYNAME_STR "SilverStorm Technologies" +#define VER_COMPANYNAME_STR "OpenIB Alliance" #ifdef VER_PRODUCTNAME_STR #undef VER_PRODUCTNAME_STR #endif -#define VER_PRODUCTNAME_STR "SilverStorm HCA 7000/9000" +#define VER_PRODUCTNAME_STR "OpenIB Windows" -#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2005 SilverStorm Technologies" +#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2005 OpenIB Alliance" diff --git a/trunk/inc/openib.def b/trunk/inc/openib.def new file mode 100644 index 00000000..76cebece --- /dev/null +++ b/trunk/inc/openib.def @@ -0,0 +1,3 @@ +!INCLUDE $(NTMAKEENV)\makefile.def + +C_DEFINES=$(C_DEFINES) -DVER_OPENIB="$(VER_OPENIB)" diff --git a/trunk/tests/alts/kernel/alts.rc b/trunk/tests/alts/kernel/alts.rc index d638045f..0b0ca481 100644 --- a/trunk/tests/alts/kernel/alts.rc +++ b/trunk/tests/alts/kernel/alts.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/tests/alts/kernel/makefile b/trunk/tests/alts/kernel/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/tests/alts/kernel/makefile +++ b/trunk/tests/alts/kernel/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/tests/alts/user/makefile b/trunk/tests/alts/user/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/tests/alts/user/makefile +++ b/trunk/tests/alts/user/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/tests/cmtest/user/makefile b/trunk/tests/cmtest/user/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/tests/cmtest/user/makefile +++ b/trunk/tests/cmtest/user/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/tools/coinstaller/user/makefile b/trunk/tools/coinstaller/user/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/tools/coinstaller/user/makefile +++ b/trunk/tools/coinstaller/user/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/tools/vstat/dirs b/trunk/tools/vstat/dirs index 5a7e8b31..389156fd 100644 --- a/trunk/tools/vstat/dirs +++ b/trunk/tools/vstat/dirs @@ -1,2 +1,2 @@ -DIRS=\ - user +DIRS=\ + user diff --git a/trunk/tools/vstat/user/makefile b/trunk/tools/vstat/user/makefile index 58189757..bffacaa7 100644 --- a/trunk/tools/vstat/user/makefile +++ b/trunk/tools/vstat/user/makefile @@ -1,7 +1,7 @@ -# -# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source -# file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK -# - -!INCLUDE $(NTMAKEENV)\makefile.def +# +# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source +# file to this component. This file merely indirects to the real make file +# that is shared by all the driver components of the OpenIB Windows project. +# + +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/tools/vstat/user/vstat.rc b/trunk/tools/vstat/user/vstat.rc index 0bd0bfcf..19a9103b 100644 --- a/trunk/tools/vstat/user/vstat.rc +++ b/trunk/tools/vstat/user/vstat.rc @@ -1,47 +1,47 @@ -/* - * Copyright (c) 2005 Mellanox Technologies. All rights reserved. - * - * This software is available to you under the OpenIB.org BSD license - * below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * $Id$ - */ - - -#include - -#define VER_FILETYPE VFT_APP -#define VER_FILESUBTYPE VFT2_UNKNOWN - -#ifdef _DEBUG_ -#define VER_FILEDESCRIPTION_STR "HCA Status Report Application (Debug)" -#else -#define VER_FILEDESCRIPTION_STR "HCA Status Report Application" -#endif - -#define VER_INTERNALNAME_STR "vstat.exe" -#define VER_ORIGINALFILENAME_STR "vstat.exe" - -#include +/* + * Copyright (c) 2005 Mellanox Technologies. All rights reserved. + * + * This software is available to you under the OpenIB.org BSD license + * below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * $Id$ + */ + + +#include + +#define VER_FILETYPE VFT_APP +#define VER_FILESUBTYPE VFT2_UNKNOWN + +#ifdef _DEBUG_ +#define VER_FILEDESCRIPTION_STR "HCA Status Report Application (Debug)" +#else +#define VER_FILEDESCRIPTION_STR "HCA Status Report Application" +#endif + +#define VER_INTERNALNAME_STR "vstat.exe" +#define VER_ORIGINALFILENAME_STR "vstat.exe" + +#include diff --git a/trunk/tools/wsdinstall/user/installsp.c b/trunk/tools/wsdinstall/user/installsp.c index c31fcb31..8111f08d 100644 --- a/trunk/tools/wsdinstall/user/installsp.c +++ b/trunk/tools/wsdinstall/user/installsp.c @@ -45,9 +45,9 @@ /* Initialize the LSP's provider path for Infiband Service Provider dll */ static const WCHAR *provider_path = L"%SYSTEMROOT%\\system32\\ibwsd.dll"; -static const WCHAR *provider_name = L"SilverStorm Winsock Direct for InfiniBand"; +static const WCHAR *provider_name = L"OpenIB Winsock Direct for InfiniBand"; static const char *winsock_key_path = "System\\CurrentControlSet\\Services\\Winsock\\Parameters\\TCP on SAN"; -static const char *silverstorm_key_name = "SilverStorm InfiniBand"; +static const char *openib_key_name = "OpenIB Alliance"; /* Unique provider GUID generated with "uuidgen -s" */ static GUID provider_guid = { @@ -68,9 +68,10 @@ static void usage (char *progname) { printf ("usage: %s [-i/-r]\n", progname); - printf (" -i Install the service provider\n" - " -r Remove the service provider\n" - " -l List service providers\n"); + printf (" -i Install the service provider\n" + " -r Remove the OpenIB service provider\n" + " -r Remove the specified service provider\n" + " -l List service providers\n"); } @@ -147,7 +148,7 @@ static void install_provider(void) REG_OPTION_NON_VOLATILE, (KEY_WRITE | KEY_READ), NULL, &hkey, NULL ); if( reg_error == ERROR_SUCCESS ) { - reg_error = RegSetValueEx( hkey, silverstorm_key_name, 0, REG_BINARY, + reg_error = RegSetValueEx( hkey, openib_key_name, 0, REG_BINARY, (PBYTE)&provider_guid, sizeof(GUID) ); if( reg_error == ERROR_SUCCESS ) { @@ -207,7 +208,7 @@ static void install_provider(void) * Function: remove_provider * Description: removes our provider. */ -static void remove_provider(void) +static void remove_provider( const char* const provider_name ) { int rc; int errno; @@ -222,7 +223,7 @@ static void remove_provider(void) &hkey); if (reg_error == ERROR_SUCCESS) { - reg_error = RegDeleteValue(hkey, silverstorm_key_name); + reg_error = RegDeleteValue(hkey, provider_name); if (reg_error == ERROR_SUCCESS) { /* Force the system to remove the key now. */ RegFlushKey(hkey); @@ -276,7 +277,7 @@ int __cdecl main (int argc, char *argv[]) ("InstallSP: Unable to find a usable version of Winsock DLL\n"); return -1; } - if (argc != 2) { + if (argc < 2) { usage (argv[0]); return -1; } @@ -294,7 +295,10 @@ int __cdecl main (int argc, char *argv[]) case 'r': /* Remove the service provider */ - remove_provider (); + if( argc == 2 ) + remove_provider( openib_key_name ); + else + remove_provider( argv[2] ); break; case 'l': diff --git a/trunk/tools/wsdinstall/user/makefile b/trunk/tools/wsdinstall/user/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/tools/wsdinstall/user/makefile +++ b/trunk/tools/wsdinstall/user/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/ulp/dapl/dapl/udapl/makefile b/trunk/ulp/dapl/dapl/udapl/makefile index 9c985f57..a0c06273 100644 --- a/trunk/ulp/dapl/dapl/udapl/makefile +++ b/trunk/ulp/dapl/dapl/udapl/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\..\inc\openib.def diff --git a/trunk/ulp/dapl/dat/udat/makefile b/trunk/ulp/dapl/dat/udat/makefile index 9c985f57..a0c06273 100644 --- a/trunk/ulp/dapl/dat/udat/makefile +++ b/trunk/ulp/dapl/dat/udat/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\..\inc\openib.def diff --git a/trunk/ulp/dapl/test/udapl/dapltest/makefile b/trunk/ulp/dapl/test/udapl/dapltest/makefile index 9c985f57..d4938551 100644 --- a/trunk/ulp/dapl/test/udapl/dapltest/makefile +++ b/trunk/ulp/dapl/test/udapl/dapltest/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\..\..\inc\openib.def diff --git a/trunk/ulp/dirs b/trunk/ulp/dirs index 75d677ac..87be0553 100644 --- a/trunk/ulp/dirs +++ b/trunk/ulp/dirs @@ -1,6 +1,6 @@ DIRS=\ + opensm \ dapl \ ipoib \ - srp \ - opensm \ + srp \ wsd diff --git a/trunk/ulp/ipoib/kernel/ipoib.rc b/trunk/ulp/ipoib/kernel/ipoib.rc index 393a43fd..9d04836f 100644 --- a/trunk/ulp/ipoib/kernel/ipoib.rc +++ b/trunk/ulp/ipoib/kernel/ipoib.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/ulp/ipoib/kernel/makefile b/trunk/ulp/ipoib/kernel/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/ulp/ipoib/kernel/makefile +++ b/trunk/ulp/ipoib/kernel/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/ulp/opensm/user/opensm/Makefile b/trunk/ulp/opensm/user/opensm/Makefile index 9c985f57..a0c06273 100644 --- a/trunk/ulp/opensm/user/opensm/Makefile +++ b/trunk/ulp/opensm/user/opensm/Makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\..\inc\openib.def diff --git a/trunk/ulp/opensm/user/opensm/opensm.rc b/trunk/ulp/opensm/user/opensm/opensm.rc index 588b227a..525ef064 100644 --- a/trunk/ulp/opensm/user/opensm/opensm.rc +++ b/trunk/ulp/opensm/user/opensm/opensm.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_APP #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/ulp/srp/dirs b/trunk/ulp/srp/dirs index ed41dcf4..ddf0ed7d 100644 --- a/trunk/ulp/srp/dirs +++ b/trunk/ulp/srp/dirs @@ -1,2 +1,3 @@ DIRS=\ + user \ kernel diff --git a/trunk/ulp/srp/kernel/ibsrp.rc b/trunk/ulp/srp/kernel/ibsrp.rc index f10c7f32..5de864e8 100644 --- a/trunk/ulp/srp/kernel/ibsrp.rc +++ b/trunk/ulp/srp/kernel/ibsrp.rc @@ -30,7 +30,7 @@ */ -#include +#include #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/ulp/srp/kernel/makefile b/trunk/ulp/srp/kernel/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/ulp/srp/kernel/makefile +++ b/trunk/ulp/srp/kernel/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def diff --git a/trunk/ulp/wsd/user/ibspdll.rc b/trunk/ulp/wsd/user/ibspdll.rc index a752aae0..3cbc9d8e 100644 --- a/trunk/ulp/wsd/user/ibspdll.rc +++ b/trunk/ulp/wsd/user/ibspdll.rc @@ -29,7 +29,8 @@ * $Id$ */ -#include + +#include #define VER_FILETYPE VFT_DLL #define VER_FILESUBTYPE VFT2_UNKNOWN diff --git a/trunk/ulp/wsd/user/makefile b/trunk/ulp/wsd/user/makefile index 9c985f57..bffacaa7 100644 --- a/trunk/ulp/wsd/user/makefile +++ b/trunk/ulp/wsd/user/makefile @@ -1,7 +1,7 @@ # # DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source # file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK +# that is shared by all the driver components of the OpenIB Windows project. # -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE ..\..\..\inc\openib.def -- 2.41.0