[ofw] [MLX4] HCA - remove hard coded WdfCoInstaller version numbers
Stan C. Smith
stan.smith at intel.com
Wed Apr 1 17:29:59 PDT 2009
Hello,
Please find patches to remove the hard coded WdfCoInstaller version string from .inx files.
The process uses stampinf '-k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)' to expand the macro
'$KMDFCOINSTALLERVERSION$' in the .inx file.
This change allows a no src change transition to newer WDK versions where the WdfCoInstaller has changed from 1.7(01007)
--> 1.9(01009).
The change of KMDF_VERSION --> KMDF_VERSION_MAJOR is WDK suggested as the former will be deprecated in an future WDK
release.
Additionally, the outdated Server 2003 DDK build env test was removed.
Stan.
--- hw/mlx4/kernel/hca/SOURCES Wed Apr 01 17:21:44 2009
+++ hw/mlx4/kernel/hca/SOURCES.new Wed Apr 01 10:44:20 2009
@@ -2,13 +2,11 @@
TARGETPATH=..\..\..\..\bin\kernel\obj$(BUILD_ALT_DIR)
TARGETTYPE=DRIVER
-!if $(_NT_TOOLS_VERSION) != 0x700
# WDK build only - transform .inx --> .inf adding date & version stamp.
# see .\makefile.inc
INF_NAME=$(TARGETNAME)
INF_TARGET=..\..\..\..\bin\kernel\$(O)\$(INF_NAME).inf
NTTARGETFILES=$(INF_TARGET)
-!endif
!if $(FREEBUILD)
ENABLE_EVENT_TRACING=1
@@ -40,7 +38,7 @@
NTTARGETFILE0=mofcomp
-KMDF_VERSION=1
+KMDF_VERSION_MAJOR=1
C_DEFINES=$(C_DEFINES) -DDRIVER -DDEPRECATE_DDK_FUNCTIONS -D__LITTLE_ENDIAN
#-DUSE_WDM_FRAMEWORK
--- hw/mlx4/kernel/hca/makefile.inc Wed Apr 01 17:20:17 2009
+++ hw/mlx4/kernel/hca/makefile.incnew Wed Apr 01 16:19:50 2009
@@ -14,7 +14,7 @@
_INX=.
!ENDIF
-STAMP=stampinf -a $(_BUILDARCH)
+STAMP=stampinf -a $(_BUILDARCH) -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)
!INCLUDE mod_ver.def
--- hw/mlx4/kernel/hca/mlx4_hca.inx Wed Apr 01 17:20:54 2009
+++ hw/mlx4/kernel/hca/mlx4_hca.inxnew Wed Apr 01 09:35:40 2009
@@ -61,7 +61,7 @@
mlx4_hca.sys = 1,,
mlx4u.dll = 1,,
mlx4ud.dll = 1,,
-WdfCoInstaller01007.dll = 1,,
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
ibal.dll=1,,
ibald.dll=1,,
complib.dll=1,,
@@ -80,7 +80,7 @@
mlx4ud.dll = 1,,
mlx4u32.dll = 1,,
mlx4u32d.dll = 1,,
-WdfCoInstaller01007.dll = 1,,
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
ibal.dll=1,,
ibald.dll=1,,
complib.dll=1,,
@@ -103,7 +103,7 @@
mlx4ud.dll = 1,,
mlx4u32.dll = 1,,
mlx4u32d.dll = 1,,
-WdfCoInstaller01007.dll = 1,,
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
ibal.dll=1,,
ibald.dll=1,,
complib.dll=1,,
@@ -408,10 +408,10 @@
CopyFiles=Wdf_CoInstaller_CopyFiles
[Wdf_CoInstaller_AddReg]
-HKR,,CoInstallers32,0x00010000, "WdfCoInstaller01007.dll,WdfCoInstaller"
+HKR,,CoInstallers32,0x00010000, "WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
[Wdf_CoInstaller_CopyFiles]
-WdfCoInstaller01007.dll
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll
[MLX4HCA.DDInstall.ntx86.Wdf]
KmdfService = mlx4_hca,WvWdfSect
-------------- next part --------------
A non-text attachment was scrubbed...
Name: SOURCES.patch
Type: application/octet-stream
Size: 1007 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/b90f21a1/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: makefile.inc.patch
Type: application/octet-stream
Size: 639 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/b90f21a1/attachment-0001.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mlx4_hca.inx.patch
Type: application/octet-stream
Size: 1491 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/b90f21a1/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: SOURCES
Type: application/octet-stream
Size: 1215 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/b90f21a1/attachment-0003.obj>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: makefile.inc
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/b90f21a1/attachment.ksh>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mlx4_hca.inx
Type: application/octet-stream
Size: 12998 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/b90f21a1/attachment-0004.obj>
More information about the ofw
mailing list