[Openib-windows] Branding
Fab Tillier
ftillier at silverstorm.com
Tue Oct 18 15:10:19 PDT 2005
Folks,
I just checked in changes to brand the binaries created when building this code
as OpenIB binaries rather than any particular vendor. This affected any
component that used to include ics_ver.h, which has been renamed oib_ver.h and
picks up the SVN revision through the VER_OPENIB environment variable (which
must be set or build will fail).
Diffs follow.
- Fab
Index: tools/coinstaller/user/makefile
===================================================================
--- tools/coinstaller/user/makefile (revision 122)
+++ tools/coinstaller/user/makefile (working copy)
@@ -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
Index: tools/vstat/dirs
===================================================================
--- tools/vstat/dirs (revision 122)
+++ tools/vstat/dirs (working copy)
@@ -1,2 +1,2 @@
-DIRS=\
- user
+DIRS=\
+ user
Index: tools/vstat/user/vstat.rc
===================================================================
--- tools/vstat/user/vstat.rc (revision 122)
+++ tools/vstat/user/vstat.rc (working copy)
@@ -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 <ics_ver.h>
-
-#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 <common.ver>
+/*
+ * 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 <oib_ver.h>
+
+#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 <common.ver>
Index: tools/vstat/user/makefile
===================================================================
--- tools/vstat/user/makefile (revision 122)
+++ tools/vstat/user/makefile (working copy)
@@ -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
Index: tools/wsdinstall/user/installsp.c
===================================================================
--- tools/wsdinstall/user/installsp.c (revision 122)
+++ tools/wsdinstall/user/installsp.c (working copy)
@@ -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 @@
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 <name> Remove the specified service
provider\n"
+ " -l List service providers\n");
}
@@ -147,7 +148,7 @@
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 @@
* 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 @@
&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 @@
("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 @@
case 'r':
/* Remove the service provider */
- remove_provider ();
+ if( argc == 2 )
+ remove_provider( openib_key_name );
+ else
+ remove_provider( argv[2] );
break;
case 'l':
Index: tools/wsdinstall/user/makefile
===================================================================
--- tools/wsdinstall/user/makefile (revision 122)
+++ tools/wsdinstall/user/makefile (working copy)
@@ -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
Index: ulp/dapl/test/udapl/dapltest/makefile
===================================================================
--- ulp/dapl/test/udapl/dapltest/makefile (revision 122)
+++ ulp/dapl/test/udapl/dapltest/makefile (working copy)
@@ -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
Index: ulp/dapl/dapl/udapl/makefile
===================================================================
--- ulp/dapl/dapl/udapl/makefile (revision 122)
+++ ulp/dapl/dapl/udapl/makefile (working copy)
@@ -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
Index: ulp/dapl/dat/udat/makefile
===================================================================
--- ulp/dapl/dat/udat/makefile (revision 122)
+++ ulp/dapl/dat/udat/makefile (working copy)
@@ -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
Index: ulp/dirs
===================================================================
--- ulp/dirs (revision 122)
+++ ulp/dirs (working copy)
@@ -1,6 +1,6 @@
DIRS=\
+ opensm \
dapl \
ipoib \
- srp \
- opensm \
+ srp \
wsd
Index: ulp/opensm/user/opensm/Makefile
===================================================================
--- ulp/opensm/user/opensm/Makefile (revision 122)
+++ ulp/opensm/user/opensm/Makefile (working copy)
@@ -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
Index: ulp/opensm/user/opensm/opensm.rc
===================================================================
--- ulp/opensm/user/opensm/opensm.rc (revision 122)
+++ ulp/opensm/user/opensm/opensm.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_APP
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: ulp/ipoib/kernel/ipoib.rc
===================================================================
--- ulp/ipoib/kernel/ipoib.rc (revision 122)
+++ ulp/ipoib/kernel/ipoib.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DRV
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: ulp/ipoib/kernel/makefile
===================================================================
--- ulp/ipoib/kernel/makefile (revision 122)
+++ ulp/ipoib/kernel/makefile (working copy)
@@ -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
Index: ulp/srp/kernel/ibsrp.rc
===================================================================
--- ulp/srp/kernel/ibsrp.rc (revision 122)
+++ ulp/srp/kernel/ibsrp.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DRV
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: ulp/srp/kernel/makefile
===================================================================
--- ulp/srp/kernel/makefile (revision 122)
+++ ulp/srp/kernel/makefile (working copy)
@@ -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
Index: ulp/wsd/user/ibspdll.rc
===================================================================
--- ulp/wsd/user/ibspdll.rc (revision 122)
+++ ulp/wsd/user/ibspdll.rc (working copy)
@@ -29,8 +29,9 @@
* $Id$
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
+
#define VER_FILETYPE VFT_DLL
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: ulp/wsd/user/makefile
===================================================================
--- ulp/wsd/user/makefile (revision 122)
+++ ulp/wsd/user/makefile (working copy)
@@ -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
Index: tests/cmtest/user/makefile
===================================================================
--- tests/cmtest/user/makefile (revision 122)
+++ tests/cmtest/user/makefile (working copy)
@@ -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
Index: tests/alts/kernel/alts.rc
===================================================================
--- tests/alts/kernel/alts.rc (revision 122)
+++ tests/alts/kernel/alts.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DRV
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: tests/alts/kernel/makefile
===================================================================
--- tests/alts/kernel/makefile (revision 122)
+++ tests/alts/kernel/makefile (working copy)
@@ -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
Index: tests/alts/user/makefile
===================================================================
--- tests/alts/user/makefile (revision 122)
+++ tests/alts/user/makefile (working copy)
@@ -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
Index: core/complib/kernel/SOURCES
===================================================================
--- core/complib/kernel/SOURCES (revision 122)
+++ core/complib/kernel/SOURCES (working copy)
@@ -2,9 +2,7 @@
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 @@
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
Index: core/complib/user/complib.rc
===================================================================
--- core/complib/user/complib.rc (revision 122)
+++ core/complib/user/complib.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DLL
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: core/complib/user/makefile
===================================================================
--- core/complib/user/makefile (revision 122)
+++ core/complib/user/makefile (working copy)
@@ -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
Index: core/bus/kernel/ibbus.rc
===================================================================
--- core/bus/kernel/ibbus.rc (revision 122)
+++ core/bus/kernel/ibbus.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DRV
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: core/bus/kernel/makefile
===================================================================
--- core/bus/kernel/makefile (revision 122)
+++ core/bus/kernel/makefile (working copy)
@@ -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
Index: core/al/kernel/ibal.rc
===================================================================
--- core/al/kernel/ibal.rc (revision 122)
+++ core/al/kernel/ibal.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DRV
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: core/al/kernel/makefile
===================================================================
--- core/al/kernel/makefile (revision 122)
+++ core/al/kernel/makefile (working copy)
@@ -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
Index: core/al/user/ibal.rc
===================================================================
--- core/al/user/ibal.rc (revision 122)
+++ core/al/user/ibal.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DLL
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: core/al/user/makefile
===================================================================
--- core/al/user/makefile (revision 122)
+++ core/al/user/makefile (working copy)
@@ -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
Index: core/iou/kernel/ibiou.rc
===================================================================
--- core/iou/kernel/ibiou.rc (revision 122)
+++ core/iou/kernel/ibiou.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DRV
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: core/iou/kernel/makefile
===================================================================
--- core/iou/kernel/makefile (revision 122)
+++ core/iou/kernel/makefile (working copy)
@@ -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
Index: inc/ics_ver.h
===================================================================
--- inc/ics_ver.h (revision 122)
+++ inc/ics_ver.h (working copy)
@@ -1,86 +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 <windows.h>
-#include <ntverp.h>
-
-#ifndef VER_FILEMAJORVERSION
-#define VER_FILEMAJORVERSION 3
-#endif
-
-#ifndef VER_FILEMINORVERSION
-#define VER_FILEMINORVERSION 0
-#endif
-
-#ifndef VER_FILEBUILD
-#define VER_FILEBUILD 36
-#endif
-
-#ifndef VER_FILEREV
-#define VER_FILEREV 0
-#endif
-
-#if (VER_FILEBUILD < 10)
-#define VER_FILEBPAD "000"
-#elif (VER_FILEBUILD < 100)
-#define VER_FILEBPAD "00"
-#elif (VER_FILEBUILD < 1000)
-#define VER_FILEBPAD "0"
-#else
-#define VER_FILEBPAD
-#endif
-
-#define VER_FILEVERSION VER_FILEMAJORVERSION,\
-
VER_FILEMINORVERSION,\
- VER_FILEBUILD,\
- VER_FILEREV
-
-#define VER_FILEVERSION_STR2(M,m,b,r) #M "." #m "." VER_FILEBPAD #b "." #r
-#define VER_FILEVERSION_STR1(M,m,b,r) VER_FILEVERSION_STR2(M,m,b,r)
-#define VER_FILEVERSION_STR VER_FILEVERSION_STR1(
VER_FILEMAJORVERSION, \
-
VER_FILEMINORVERSION, \
-
VER_FILEBUILD, \
-
VER_FILEREV )
-
-#undef __BUILDMACHINE__
-
-#ifdef VER_COMPANYNAME_STR
-#undef VER_COMPANYNAME_STR
-#endif
-#define VER_COMPANYNAME_STR "SilverStorm Technologies"
-
-#ifdef VER_PRODUCTNAME_STR
-#undef VER_PRODUCTNAME_STR
-#endif
-#define VER_PRODUCTNAME_STR "SilverStorm HCA 7000/9000"
-
-#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2005 SilverStorm Technologies"
Index: inc/oib_ver.h
===================================================================
--- inc/oib_ver.h (revision 122)
+++ inc/oib_ver.h (working copy)
@@ -34,7 +34,7 @@
#include <ntverp.h>
#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"
Index: hw/mt23108/vapi/kernel/mt23108.rc
===================================================================
--- hw/mt23108/vapi/kernel/mt23108.rc (revision 122)
+++ hw/mt23108/vapi/kernel/mt23108.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DRV
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: hw/mt23108/vapi/kernel/Makefile
===================================================================
--- hw/mt23108/vapi/kernel/Makefile (revision 122)
+++ hw/mt23108/vapi/kernel/Makefile (working copy)
@@ -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
Index: hw/mt23108/kernel/Makefile
===================================================================
--- hw/mt23108/kernel/Makefile (revision 122)
+++ hw/mt23108/kernel/Makefile (working copy)
@@ -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
Index: hw/mt23108/kernel/hca.rc
===================================================================
--- hw/mt23108/kernel/hca.rc (revision 122)
+++ hw/mt23108/kernel/hca.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DRV
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: hw/mt23108/user/uvpd.rc
===================================================================
--- hw/mt23108/user/uvpd.rc (revision 122)
+++ hw/mt23108/user/uvpd.rc (working copy)
@@ -30,7 +30,7 @@
*/
-#include <ics_ver.h>
+#include <oib_ver.h>
#define VER_FILETYPE VFT_DLL
#define VER_FILESUBTYPE VFT2_UNKNOWN
Index: hw/mt23108/user/Makefile
===================================================================
--- hw/mt23108/user/Makefile (revision 122)
+++ hw/mt23108/user/Makefile (working copy)
@@ -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
More information about the ofw
mailing list