[MTHCA] Remove hard-coded KMDF version numbers; use $(KMDF_VERSION_MAJOR).$(KMDF_VERS...

Remove DDK build env test.

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

diff --git a/hw/mthca/kernel/SOURCES b/hw/mthca/kernel/SOURCES
index 5364cdb..f653d22 100644 (file)
--- a/hw/mthca/kernel/SOURCES
+++ b/hw/mthca/kernel/SOURCES
@@ -4,13 +4,13 @@ TARGETNAME=mthca
 TARGETPATH=$(TRUNK)\bin\kernel\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DRIVER\r
 \r
-!if $(_NT_TOOLS_VERSION) != 0x700\r
+KMDF_VERSION_MAJOR=1\r
+\r
 # WDK build only - transform .inx --> .inf adding date & version stamp.\r
 # see .\makefile.inc\r
 INF_NAME=$(TARGETNAME)\r
 INF_TARGET=$(TRUNK)\bin\kernel\$(O)\$(INF_NAME).inf\r
 NTTARGETFILES=$(INF_TARGET)\r
-!endif\r
 \r
 !if $(FREEBUILD)\r
 ENABLE_EVENT_TRACING=1\r

diff --git a/hw/mthca/kernel/makefile.inc b/hw/mthca/kernel/makefile.inc
index 4f29f50..3f3c001 100644 (file)
--- a/hw/mthca/kernel/makefile.inc
+++ b/hw/mthca/kernel/makefile.inc
@@ -8,7 +8,7 @@ _LNG=$(LANGUAGE)
 _INX=.\r
 !ENDIF\r
 \r
-STAMP=stampinf -a $(_BUILDARCH)\r
+STAMP=stampinf -a $(_BUILDARCH) -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)\r
 \r
 !INCLUDE mod_ver.def\r
 \r

diff --git a/hw/mthca/kernel/mthca.inx b/hw/mthca/kernel/mthca.inx
index bac2dd3..90862f0 100644 (file)
--- a/hw/mthca/kernel/mthca.inx
+++ b/hw/mthca/kernel/mthca.inx
@@ -65,7 +65,7 @@ winverbsd.dll = 1,,
 winmad.sys = 1,,\r
 winmad.dll = 1,,\r
 winmadd.dll = 1,,\r
-WdfCoInstaller01007.dll = 1,,\r
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 \r
 \r
 [SourceDisksFiles.amd64]\r
@@ -89,7 +89,7 @@ winverbsd.dll = 1,,
 winmad.sys = 1,,\r
 winmad.dll = 1,,\r
 winmadd.dll = 1,,\r
-WdfCoInstaller01007.dll = 1,,\r
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 \r
 [SourceDisksFiles.ia64]\r
 mthca.sys=1,,\r
@@ -112,7 +112,7 @@ winverbsd.dll = 1,,
 winmad.sys = 1,,\r
 winmad.dll = 1,,\r
 winmadd.dll = 1,,\r
-WdfCoInstaller01007.dll = 1,,\r
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 \r
 [Manufacturer]\r
 %MTL% = HCA.DeviceSection,ntx86,ntamd64,ntia64\r
@@ -360,10 +360,10 @@ AddReg = Wdf_CoInstaller_AddReg
 CopyFiles = Wdf_CoInstaller_CopyFiles\r
 \r
 [Wdf_CoInstaller_AddReg]\r
-HKR,, CoInstallers32,0x00010000, "WdfCoInstaller01007.dll,WdfCoInstaller"\r
+HKR,, CoInstallers32,0x00010000, "WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"\r
 \r
 [Wdf_CoInstaller_CopyFiles]\r
-WdfCoInstaller01007.dll\r
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll\r
 \r
 [MTHCA.DDInstall.ntx86.Wdf]\r
 KmdfService = WinVerbs, WvWdfSect\r