From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 8 Jul 2008 18:17:07 +0000 (+0000)
Subject: [IPOIB] added INX -> INF file version stamping.
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6fabcb39ddc1d2b5a2a7674524915a5035f507df;p=~shefty%2Frdma-win.git

[IPOIB] added INX -> INF file version stamping.
INF file created in ..\..\..\bin\kernel\xxx
.inf file version now matches .sys file version.
added makefile.inc
netipoib.inf renamed to netipoib.inx per MS/WDK convention.

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

diff --git a/trunk/ulp/ipoib/kernel/SOURCES b/trunk/ulp/ipoib/kernel/SOURCES
index b85a51ba..b6d7265f 100644
--- a/trunk/ulp/ipoib/kernel/SOURCES
+++ b/trunk/ulp/ipoib/kernel/SOURCES
@@ -2,6 +2,13 @@ TARGETNAME=ipoib
 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=netipoib
+INF_TARGET=..\..\..\bin\kernel\$(O)\$(INF_NAME).inf
+NTTARGETFILES=$(INF_TARGET)
+!endif
 
 !if $(FREEBUILD)
 ENABLE_EVENT_TRACING=1
diff --git a/trunk/ulp/ipoib/kernel/makefile.inc b/trunk/ulp/ipoib/kernel/makefile.inc
new file mode 100644
index 00000000..aaa1fedd
--- /dev/null
+++ b/trunk/ulp/ipoib/kernel/makefile.inc
@@ -0,0 +1,17 @@
+
+# Transform .inx file to .inf file adding date + major,min & svn.version stamp
+# Output .inf file is copied to the $(INF_TARGET) folder (commonly where .sys file resides).
+
+_LNG=$(LANGUAGE)
+
+!IF !DEFINED(_INX)
+_INX=.
+!ENDIF
+
+STAMP=stampinf -a $(_BUILDARCH)
+
+!INCLUDE mod_ver.def
+
+$(INF_TARGET) : $(_INX)\$(INF_NAME).inx
+    copy $(_INX)\$(@B).inx $@
+    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_F3VERSION).$(OPENIB_REV)
diff --git a/trunk/ulp/ipoib/kernel/netipoib.inf b/trunk/ulp/ipoib/kernel/netipoib.inf
deleted file mode 100644
index ef377b4a..00000000
--- a/trunk/ulp/ipoib/kernel/netipoib.inf
+++ /dev/null
@@ -1,197 +0,0 @@
-; OpenIB Internet Protocol over InfiniBand Adapter
-; Copyright 2005 SilverStorm Technologies all Rights Reserved.
-; Copyright 2006 Mellanox Technologies all Rights Reserved.
-
-[Version]
-Signature   = "$Windows NT$"
-Class       = Net
-ClassGUID   = {4d36e972-e325-11ce-bfc1-08002be10318}
-Provider    = %OPENIB%
-DriverVer=06/11/2008,1.0.0000.1207
-CatalogFile=ipoib.cat
-
-[Manufacturer]
-%OPENIB%       = OPENIB,ntx86,ntamd64,ntia64
-
-[ControlFlags]
-ExcludeFromSelect = IBA\IPoIB
-
-[OPENIB]
-; empty since we don't support W9x/Me
-
-[OPENIB.ntx86]
-%IpoibDesc%      = Ipoib.DDInstall,    IBA\IPoIB   ; Internet Protocol over InfiniBand Adapter
-
-[OPENIB.ntamd64]
-%IpoibDesc%      = Ipoib.DDInstall,    IBA\IPoIB   ; Internet Protocol over InfiniBand Adapter
-
-[OPENIB.ntia64]
-%IpoibDesc%      = Ipoib.DDInstall,    IBA\IPoIB   ; Internet Protocol over InfiniBand Adapter
-
-[Ipoib.DDInstall.ntx86]
-Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
-AddReg          = IpoibAddReg
-CopyFiles       = IpoibCopyFiles
-CopyFiles		= WsdCopyFiles
-
-[Ipoib.DDInstall.ntamd64]
-Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
-AddReg          = IpoibAddReg
-CopyFiles       = IpoibCopyFiles
-CopyFiles		= WsdCopyFiles
-CopyFiles		= WOW64CopyFiles
-
-[Ipoib.DDInstall.ntia64]
-Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
-AddReg          = IpoibAddReg
-CopyFiles       = IpoibCopyFiles
-CopyFiles		= WsdCopyFiles
-CopyFiles		= WOW64CopyFiles
-
-[Ipoib.DDInstall.ntx86.Services]
-AddService = ipoib, 2, IpoibService, IpoibEventLog
-
-[Ipoib.DDInstall.ntamd64.Services]
-AddService = ipoib, 2, IpoibService, IpoibEventLog
-
-[Ipoib.DDInstall.ntia64.Services]
-AddService = ipoib, 2, IpoibService, IpoibEventLog
-
-[IpoibAddReg]
-HKR, Ndi,                       Service,    0, "ipoib"
-HKR, Ndi\Interfaces,            UpperRange, 0, "ndis5"
-HKR, Ndi\Interfaces,            LowerRange, 0, "ethernet"
-
-HKR, Ndi\Params\RqDepth,		ParamDesc,	0, "Receive Queue Depth"
-HKR, Ndi\Params\RqDepth,		Type,		0, "dword"
-HKR, Ndi\Params\RqDepth,		Default,	0, "512"
-HKR, Ndi\Params\RqDepth,		Optional,	0, "0"
-HKR, Ndi\Params\RqDepth,		Min,		0, "128"
-HKR, Ndi\Params\RqDepth,		Max,		0, "1024"
-HKR, Ndi\Params\RqDepth,		Step,		0, "128"
-
-HKR, Ndi\Params\RqLowWatermark,	ParamDesc,	0, "Receive Queue Low Watermark"
-HKR, Ndi\Params\RqLowWatermark,	Type,		0, "dword"
-HKR, Ndi\Params\RqLowWatermark,	Default,	0, "4"
-HKR, Ndi\Params\RqLowWatermark,	Optional,	0, "1"
-HKR, Ndi\Params\RqLowWatermark,	Min,		0, "2"
-HKR, Ndi\Params\RqLowWatermark,	Max,		0, "8"
-HKR, Ndi\Params\RqLowWatermark,	Step,		0, "1"
-
-HKR, Ndi\Params\SqDepth,		ParamDesc,	0, "Send Queue Depth"
-HKR, Ndi\Params\SqDepth,		Type,		0, "dword"
-HKR, Ndi\Params\SqDepth,		Default,	0, "512"
-HKR, Ndi\Params\SqDepth,		Optional,	0, "0"
-HKR, Ndi\Params\SqDepth,		Min,		0, "128"
-HKR, Ndi\Params\SqDepth,		Max,		0, "1024"
-HKR, Ndi\Params\SqDepth,		Step,		0, "128"
-
-HKR, Ndi\Params\SendChksum,		ParamDesc,	0, "Send Checksum Offload"
-HKR, Ndi\Params\SendChksum,		Type,		0, "enum"
-HKR, Ndi\Params\SendChksum,		Default,	0, "0"
-HKR, Ndi\Params\SendChksum,		Optional,	0, "0"
-HKR, Ndi\Params\SendChksum\enum,	"0",	0, "Disabled"
-HKR, Ndi\Params\SendChksum\enum,	"1",	0, "Enabled"
-
-HKR, Ndi\Params\RecvChksum,		ParamDesc,	0, "Recv Checksum Offload"
-HKR, Ndi\Params\RecvChksum,		Type,		0, "enum"
-HKR, Ndi\Params\RecvChksum,		Default,	0, "0"
-HKR, Ndi\Params\RecvChksum,		Optional,	0, "0"
-HKR, Ndi\Params\RecvChksum\enum,	"0",	0, "Disabled"
-HKR, Ndi\Params\RecvChksum\enum,	"1",	0, "Enabled"
-
-HKR, Ndi\Params\SaTimeout,		ParamDesc,	0, "SA Query Timeout (ms)"
-HKR, Ndi\Params\SaTimeout,		Type,		0, "dword"
-HKR, Ndi\Params\SaTimeout,		Default,	0, "1000"
-HKR, Ndi\Params\SaTimeout,		Optional,	0, "0"
-HKR, Ndi\Params\SaTimeout,		Min,		0, "500"
-HKR, Ndi\Params\SaTimeout,		Step,		0, "250"
-
-HKR, Ndi\Params\SaRetries,		ParamDesc,	0, "SA Query Retry Count"
-HKR, Ndi\Params\SaRetries,		Type,		0, "dword"
-HKR, Ndi\Params\SaRetries,		Default,	0, "10"
-HKR, Ndi\Params\SaRetries,		Optional,	0, "0"
-HKR, Ndi\Params\SaRetries,		Min,		0, "1"
-
-HKR, Ndi\Params\RecvRatio,		ParamDesc,	0, "Receive Pool Ratio"
-HKR, Ndi\Params\RecvRatio,		Type,		0, "dword"
-HKR, Ndi\Params\RecvRatio,		Default,	0, "1"
-HKR, Ndi\Params\RecvRatio,		Optional,	0, "0"
-HKR, Ndi\Params\RecvRatio,		Min,		0, "1"
-HKR, Ndi\Params\RecvRatio,		Max,		0, "10"
-
-HKR, Ndi\Params\PayloadMtu,		ParamDesc,	0, "Payload Mtu size"
-HKR, Ndi\Params\PayloadMtu,		Type,		0, "dword"
-HKR, Ndi\Params\PayloadMtu,		Default,	0, "2044"
-HKR, Ndi\Params\PayloadMtu,		Min,		0, "60"
-HKR, Ndi\Params\PayloadMtu,		Max,		0, "4092"
-
-[IpoibService]
-DisplayName     = %IpoibServiceDispName%
-ServiceType     = 1 ;%SERVICE_KERNEL_DRIVER%
-StartType       = 3 ;%SERVICE_DEMAND_START%
-ErrorControl    = 1 ;%SERVICE_ERROR_NORMAL%
-ServiceBinary   = %12%\ipoib.sys
-LoadOrderGroup  = NDIS
-AddReg          = Ipoib.ParamsReg
-
-[Ipoib.ParamsReg]
-HKR,"Parameters","DebugLevel",%REG_DWORD_NO_CLOBBER%,0x00000002
-HKR,"Parameters","DebugFlags",%REG_DWORD_NO_CLOBBER%,0x00000fff
-HKR,"Parameters","bypass_check_bcast_rate",%REG_DWORD_NO_CLOBBER%,0x00000000
-
-[IpoibEventLog]
-AddReg = IpoibAddEventLogReg
-
-[IpoibAddEventLogReg]
-HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll;%%SystemRoot%%\System32\drivers\ipoib.sys"
-HKR, , TypesSupported,   0x00010001, 7
-
-
-[IpoibCopyFiles]
-ipoib.sys,,,2
-
-[WsdCopyFiles]
-ibwsd.dll,,,0x00000002
-
-[WOW64CopyFiles]
-ibwsd.dll,ibwsd32.dll,,0x00000002
-
-[SourceDisksNames.x86]
-1 = %IcsDisk1%,,,""
-
-[SourceDisksNames.amd64]
-1 = %IcsDisk1%,,,""
-
-[SourceDisksNames.ia64]
-1 = %IcsDisk1%,,,""
-
-[SourceDisksFiles.x86]
-ipoib.sys = 1
-ibwsd.dll = 1
-
-[SourceDisksFiles.amd64]
-ipoib.sys = 1
-ibwsd.dll = 1
-ibwsd32.dll = 1
-
-[SourceDisksFiles.ia64]
-ipoib.sys = 1
-ibwsd.dll = 1
-ibwsd32.dll = 1
-
-[DestinationDirs]
-IpoibCopyFiles    = %DIRID_DRIVERS%
-WsdCopyFiles      = %DIRID_SYSTEM%
-WOW64CopyFiles    = %DIRID_SYSTEM_X86%
-DefaultDestDir    = %DIRID_SYSTEM%
-
-[Strings]
-OPENIB               = "OpenIB Alliance"
-IpoibDesc            = "OpenIB IPoIB Adapter"
-IpoibServiceDispName = "IPoIB"
-IcsDisk1             = "OpenIB IPoIB Disk #1"
-DIRID_SYSTEM         = 11
-DIRID_DRIVERS        = 12
-DIRID_SYSTEM_X86     = 16425
-REG_DWORD_NO_CLOBBER = 0x00010003
diff --git a/trunk/ulp/ipoib/kernel/netipoib.inx b/trunk/ulp/ipoib/kernel/netipoib.inx
new file mode 100644
index 00000000..6394e8ed
--- /dev/null
+++ b/trunk/ulp/ipoib/kernel/netipoib.inx
@@ -0,0 +1,197 @@
+; OpenIB Internet Protocol over InfiniBand Adapter
+; Copyright 2005 SilverStorm Technologies all Rights Reserved.
+; Copyright 2006 Mellanox Technologies all Rights Reserved.
+
+[Version]
+Signature   = "$Windows NT$"
+Class       = Net
+ClassGUID   = {4d36e972-e325-11ce-bfc1-08002be10318}
+Provider    = %OPENIB%
+DriverVer=06/11/2008,1.0.0000.1207
+CatalogFile=ipoib.cat
+
+[Manufacturer]
+%OPENIB%       = OPENIB,ntx86,ntamd64,ntia64
+
+[ControlFlags]
+ExcludeFromSelect = IBA\IPoIB
+
+[OPENIB]
+; empty since we don't support W9x/Me
+
+[OPENIB.ntx86]
+%IpoibDesc%      = Ipoib.DDInstall,    IBA\IPoIB   ; Internet Protocol over InfiniBand Adapter
+
+[OPENIB.ntamd64]
+%IpoibDesc%      = Ipoib.DDInstall,    IBA\IPoIB   ; Internet Protocol over InfiniBand Adapter
+
+[OPENIB.ntia64]
+%IpoibDesc%      = Ipoib.DDInstall,    IBA\IPoIB   ; Internet Protocol over InfiniBand Adapter
+
+[Ipoib.DDInstall.ntx86]
+Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
+AddReg          = IpoibAddReg
+CopyFiles       = IpoibCopyFiles
+CopyFiles		= WsdCopyFiles
+
+[Ipoib.DDInstall.ntamd64]
+Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
+AddReg          = IpoibAddReg
+CopyFiles       = IpoibCopyFiles
+CopyFiles		= WsdCopyFiles
+CopyFiles		= WOW64CopyFiles
+
+[Ipoib.DDInstall.ntia64]
+Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
+AddReg          = IpoibAddReg
+CopyFiles       = IpoibCopyFiles
+CopyFiles		= WsdCopyFiles
+CopyFiles		= WOW64CopyFiles
+
+[Ipoib.DDInstall.ntx86.Services]
+AddService = ipoib, 2, IpoibService, IpoibEventLog
+
+[Ipoib.DDInstall.ntamd64.Services]
+AddService = ipoib, 2, IpoibService, IpoibEventLog
+
+[Ipoib.DDInstall.ntia64.Services]
+AddService = ipoib, 2, IpoibService, IpoibEventLog
+
+[IpoibAddReg]
+HKR, Ndi,                       Service,    0, "ipoib"
+HKR, Ndi\Interfaces,            UpperRange, 0, "ndis5"
+HKR, Ndi\Interfaces,            LowerRange, 0, "ethernet"
+
+HKR, Ndi\Params\RqDepth,		ParamDesc,	0, "Receive Queue Depth"
+HKR, Ndi\Params\RqDepth,		Type,		0, "dword"
+HKR, Ndi\Params\RqDepth,		Default,	0, "512"
+HKR, Ndi\Params\RqDepth,		Optional,	0, "0"
+HKR, Ndi\Params\RqDepth,		Min,		0, "128"
+HKR, Ndi\Params\RqDepth,		Max,		0, "1024"
+HKR, Ndi\Params\RqDepth,		Step,		0, "128"
+
+HKR, Ndi\Params\RqLowWatermark,	ParamDesc,	0, "Receive Queue Low Watermark"
+HKR, Ndi\Params\RqLowWatermark,	Type,		0, "dword"
+HKR, Ndi\Params\RqLowWatermark,	Default,	0, "4"
+HKR, Ndi\Params\RqLowWatermark,	Optional,	0, "1"
+HKR, Ndi\Params\RqLowWatermark,	Min,		0, "2"
+HKR, Ndi\Params\RqLowWatermark,	Max,		0, "8"
+HKR, Ndi\Params\RqLowWatermark,	Step,		0, "1"
+
+HKR, Ndi\Params\SqDepth,		ParamDesc,	0, "Send Queue Depth"
+HKR, Ndi\Params\SqDepth,		Type,		0, "dword"
+HKR, Ndi\Params\SqDepth,		Default,	0, "512"
+HKR, Ndi\Params\SqDepth,		Optional,	0, "0"
+HKR, Ndi\Params\SqDepth,		Min,		0, "128"
+HKR, Ndi\Params\SqDepth,		Max,		0, "1024"
+HKR, Ndi\Params\SqDepth,		Step,		0, "128"
+
+HKR, Ndi\Params\SendChksum,		ParamDesc,	0, "Send Checksum Offload"
+HKR, Ndi\Params\SendChksum,		Type,		0, "enum"
+HKR, Ndi\Params\SendChksum,		Default,	0, "0"
+HKR, Ndi\Params\SendChksum,		Optional,	0, "0"
+HKR, Ndi\Params\SendChksum\enum,	"0",	0, "Disabled"
+HKR, Ndi\Params\SendChksum\enum,	"1",	0, "Enabled"
+
+HKR, Ndi\Params\RecvChksum,		ParamDesc,	0, "Recv Checksum Offload"
+HKR, Ndi\Params\RecvChksum,		Type,		0, "enum"
+HKR, Ndi\Params\RecvChksum,		Default,	0, "0"
+HKR, Ndi\Params\RecvChksum,		Optional,	0, "0"
+HKR, Ndi\Params\RecvChksum\enum,	"0",	0, "Disabled"
+HKR, Ndi\Params\RecvChksum\enum,	"1",	0, "Enabled"
+
+HKR, Ndi\Params\SaTimeout,		ParamDesc,	0, "SA Query Timeout (ms)"
+HKR, Ndi\Params\SaTimeout,		Type,		0, "dword"
+HKR, Ndi\Params\SaTimeout,		Default,	0, "1000"
+HKR, Ndi\Params\SaTimeout,		Optional,	0, "0"
+HKR, Ndi\Params\SaTimeout,		Min,		0, "500"
+HKR, Ndi\Params\SaTimeout,		Step,		0, "250"
+
+HKR, Ndi\Params\SaRetries,		ParamDesc,	0, "SA Query Retry Count"
+HKR, Ndi\Params\SaRetries,		Type,		0, "dword"
+HKR, Ndi\Params\SaRetries,		Default,	0, "10"
+HKR, Ndi\Params\SaRetries,		Optional,	0, "0"
+HKR, Ndi\Params\SaRetries,		Min,		0, "1"
+
+HKR, Ndi\Params\RecvRatio,		ParamDesc,	0, "Receive Pool Ratio"
+HKR, Ndi\Params\RecvRatio,		Type,		0, "dword"
+HKR, Ndi\Params\RecvRatio,		Default,	0, "1"
+HKR, Ndi\Params\RecvRatio,		Optional,	0, "0"
+HKR, Ndi\Params\RecvRatio,		Min,		0, "1"
+HKR, Ndi\Params\RecvRatio,		Max,		0, "10"
+
+HKR, Ndi\Params\PayloadMtu,		ParamDesc,	0, "Payload Mtu size"
+HKR, Ndi\Params\PayloadMtu,		Type,		0, "dword"
+HKR, Ndi\Params\PayloadMtu,		Default,	0, "2044"
+HKR, Ndi\Params\PayloadMtu,		Min,		0, "60"
+HKR, Ndi\Params\PayloadMtu,		Max,		0, "2044"
+
+[IpoibService]
+DisplayName     = %IpoibServiceDispName%
+ServiceType     = 1 ;%SERVICE_KERNEL_DRIVER%
+StartType       = 3 ;%SERVICE_DEMAND_START%
+ErrorControl    = 1 ;%SERVICE_ERROR_NORMAL%
+ServiceBinary   = %12%\ipoib.sys
+LoadOrderGroup  = NDIS
+AddReg          = Ipoib.ParamsReg
+
+[Ipoib.ParamsReg]
+HKR,"Parameters","DebugLevel",%REG_DWORD_NO_CLOBBER%,0x00000002
+HKR,"Parameters","DebugFlags",%REG_DWORD_NO_CLOBBER%,0x00000fff
+HKR,"Parameters","bypass_check_bcast_rate",%REG_DWORD_NO_CLOBBER%,0x00000000
+
+[IpoibEventLog]
+AddReg = IpoibAddEventLogReg
+
+[IpoibAddEventLogReg]
+HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll;%%SystemRoot%%\System32\drivers\ipoib.sys"
+HKR, , TypesSupported,   0x00010001, 7
+
+
+[IpoibCopyFiles]
+ipoib.sys,,,2
+
+[WsdCopyFiles]
+ibwsd.dll,,,0x00000002
+
+[WOW64CopyFiles]
+ibwsd.dll,ibwsd32.dll,,0x00000002
+
+[SourceDisksNames.x86]
+1 = %IcsDisk1%,,,""
+
+[SourceDisksNames.amd64]
+1 = %IcsDisk1%,,,""
+
+[SourceDisksNames.ia64]
+1 = %IcsDisk1%,,,""
+
+[SourceDisksFiles.x86]
+ipoib.sys = 1
+ibwsd.dll = 1
+
+[SourceDisksFiles.amd64]
+ipoib.sys = 1
+ibwsd.dll = 1
+ibwsd32.dll = 1
+
+[SourceDisksFiles.ia64]
+ipoib.sys = 1
+ibwsd.dll = 1
+ibwsd32.dll = 1
+
+[DestinationDirs]
+IpoibCopyFiles    = %DIRID_DRIVERS%
+WsdCopyFiles      = %DIRID_SYSTEM%
+WOW64CopyFiles    = %DIRID_SYSTEM_X86%
+DefaultDestDir    = %DIRID_SYSTEM%
+
+[Strings]
+OPENIB               = "OpenIB Alliance"
+IpoibDesc            = "OpenIB IPoIB Adapter"
+IpoibServiceDispName = "IPoIB"
+IcsDisk1             = "OpenIB IPoIB Disk #1"
+DIRID_SYSTEM         = 11
+DIRID_DRIVERS        = 12
+DIRID_SYSTEM_X86     = 16425
+REG_DWORD_NO_CLOBBER = 0x00010003