From 2dc7d7d0b46f28100c086bafd668be7051ef25c3 Mon Sep 17 00:00:00 2001
From: leonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Sun, 11 May 2008 12:26:34 +0000
Subject: [PATCH] [MLX4] The following patch solves a problem on some machines
 where IbInstaller.dll isn't found by INF installation process.

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1156 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 hw/mlx4/kernel/hca/mlx4_hca.inf | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/hw/mlx4/kernel/hca/mlx4_hca.inf b/hw/mlx4/kernel/hca/mlx4_hca.inf
index d832c0b6..9cd15303 100644
--- a/hw/mlx4/kernel/hca/mlx4_hca.inf
+++ b/hw/mlx4/kernel/hca/mlx4_hca.inf
@@ -16,11 +16,11 @@ CatalogFile=mlx4_hca.cat
 ;*****************************************
 
 [DestinationDirs]
-DefaultDestDir = 12
-Wdf_CoInstaller_CopyFiles = 11
-ClassCopyFiles = 11
-MLX4HCA.UMCopyFiles = 11
-MLX4HCA.WOW64CopyFiles = 16425
+DefaultDestDir = %DIRID_DRIVERS%
+ClassCopyFiles = %DIRID_SYSTEM%
+MLX4HCA.UMCopyFiles = %DIRID_SYSTEM%
+MLX4HCA.WOW64CopyFiles = %DIRID_SYSTEM_X86%
+;Wdf_CoInstaller_CopyFiles = %DIRID_SYSTEM%
 
 ;*****************************************
 ; Class Install section
@@ -54,14 +54,14 @@ HKLM,"System\CurrentControlSet\Control\CoDeviceInstallers", \
 1=%DiskId%,,,""
 
 [SourceDisksFiles.x86]
-IbInstaller.dll=1
+IbInstaller.dll = 1,,
 mlx4_hca.sys = 1,,
 mlx4u.dll = 1,,
 mlx4ud.dll = 1,,
 ;wdfcoinstaller01005.dll = 1,,
 
 [SourceDisksFiles.amd64]
-IbInstaller.dll=1
+IbInstaller.dll = 1,,
 mlx4_hca.sys = 1,,
 mlx4u.dll = 1,,
 mlx4ud.dll = 1,,
@@ -70,7 +70,7 @@ mlx4u32d.dll = 1,,
 ;wdfcoinstaller01005.dll = 1,,
 
 [SourceDisksFiles.ia64]
-IbInstaller.dll=1
+IbInstaller.dll = 1,,
 mlx4_hca.sys = 1,,
 mlx4u.dll = 1,,
 mlx4ud.dll = 1,,
@@ -220,3 +220,6 @@ SERVICE_DEMAND_START   = 3
 SERVICE_ERROR_NORMAL   = 1
 REG_DWORD              = 0x00010001
 REG_MULTI_SZ_APPEND    = 0x00010008
+DIRID_SYSTEM           = 11
+DIRID_DRIVERS          = 12
+DIRID_SYSTEM_X86       = 16425
-- 
2.17.1