[IPOIB] remove ND components from ia64 driver install. Leo OK'ed - signed off by...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 12 May 2009 23:50:23 +0000 (23:50 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 12 May 2009 23:50:23 +0000 (23:50 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2180 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

ulp/ipoib/kernel/netipoib-xp32.inf
ulp/ipoib/kernel/netipoib.inx

index 92f2114..e24f207 100644 (file)
@@ -7,7 +7,7 @@ Signature   = "$Windows NT$"
 Class       = Net\r
 ClassGUID   = {4d36e972-e325-11ce-bfc1-08002be10318}\r
 Provider    = %OPENIB%\r
-DriverVer=10/10/2008,2.0.0000.1630\r
+DriverVer=10/10/2008,2.0.0000.2159\r
 CatalogFile=ipoib.cat\r
 \r
 [Manufacturer]\r
@@ -41,6 +41,7 @@ CopyFiles       = NdCopyFiles
 Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL\r
 AddReg          = IpoibAddReg\r
 CopyFiles       = IpoibCopyFiles\r
+CopyFiles       = WsdCopyFiles\r
 CopyFiles       = NdCopyFiles\r
 CopyFiles       = WOW64CopyFiles\r
 \r
@@ -48,8 +49,8 @@ CopyFiles       = WOW64CopyFiles
 Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL\r
 AddReg          = IpoibAddReg\r
 CopyFiles       = IpoibCopyFiles\r
-CopyFiles       = NdCopyFiles\r
-CopyFiles       = WOW64CopyFiles\r
+CopyFiles       = WsdCopyFiles\r
+CopyFiles       = WOW64WsdCopyFiles\r
 \r
 [Ipoib.DDInstall.ntx86.Services]\r
 AddService = ipoib, 2, IpoibService, IpoibEventLog\r
@@ -187,6 +188,9 @@ HKR, , TypesSupported,   0x00010001, 7
 [IpoibCopyFiles]\r
 ipoib.sys,,,2\r
 \r
+[WsdCopyFiles]\r
+ibwsd.dll,,,0x00000002\r
+\r
 [NdCopyFiles]\r
 ibndprov.dll,,,0x00000002\r
 ndinstall.exe,,,0x00000002\r
@@ -195,6 +199,9 @@ ndinstall.exe,,,0x00000002
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
 ibndprov.dll,ibndprov32.dll,,0x00000002\r
 \r
+[WOW64WsdCopyFiles]\r
+ibwsd.dll,ibwsd32.dll,,0x00000002\r
+\r
 [SourceDisksNames.x86]\r
 1 = %IcsDisk1%,,,""\r
 \r
@@ -221,15 +228,13 @@ ndinstall.exe = 1
 ipoib.sys = 1\r
 ibwsd.dll = 1\r
 ibwsd32.dll = 1\r
-ibndprov.dll = 1\r
-ibndprov32.dll = 1\r
-ndinstall.exe = 1\r
 \r
 [DestinationDirs]\r
 IpoibCopyFiles    = %DIRID_DRIVERS%\r
 WsdCopyFiles      = %DIRID_SYSTEM%\r
 NdCopyFiles       = %DIRID_SYSTEM%\r
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%\r
+WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%\r
 DefaultDestDir    = %DIRID_SYSTEM%\r
 \r
 [Strings]\r
index 795a1b8..1a7a6db 100644 (file)
@@ -51,8 +51,7 @@ Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
 AddReg          = IpoibAddReg\r
 CopyFiles       = IpoibCopyFiles\r
 CopyFiles       = WsdCopyFiles\r
-CopyFiles       = NdCopyFiles\r
-CopyFiles       = WOW64CopyFiles\r
+CopyFiles       = WOW64WsdCopyFiles\r
 \r
 [Ipoib.DDInstall.ntx86.Services]\r
 AddService = ipoib, 2, IpoibService, IpoibEventLog\r
@@ -201,6 +200,9 @@ ndinstall.exe,,,0x00000002
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
 ibndprov.dll,ibndprov32.dll,,0x00000002\r
 \r
+[WOW64WsdCopyFiles]\r
+ibwsd.dll,ibwsd32.dll,,0x00000002\r
+\r
 [SourceDisksNames.x86]\r
 1 = %IcsDisk1%,,,""\r
 \r
@@ -228,15 +230,13 @@ ndinstall.exe = 1
 ipoib.sys = 1\r
 ibwsd.dll = 1\r
 ibwsd32.dll = 1\r
-ibndprov.dll = 1\r
-ibndprov32.dll = 1\r
-ndinstall.exe = 1\r
 \r
 [DestinationDirs]\r
 IpoibCopyFiles    = %DIRID_DRIVERS%\r
 WsdCopyFiles      = %DIRID_SYSTEM%\r
 NdCopyFiles       = %DIRID_SYSTEM%\r
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%\r
+WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%\r
 DefaultDestDir    = %DIRID_SYSTEM%\r
 \r
 [Strings]\r