From 65cae4e1268a293287b87cb8251717f55053a8a3 Mon Sep 17 00:00:00 2001
From: leonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Wed, 22 Oct 2008 15:13:01 +0000
Subject: [PATCH] [MLX4,MTHCA] fix minor typos

git-svn-id: svn://openib.tc.cornell.edu/gen1@1682 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/hw/mlx4/kernel/hca/mlx4_hca.inx | 17 +++++++++--------
 trunk/hw/mthca/kernel/mthca.inx       | 14 +++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx b/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
index 96ba5429..deae787e 100644
--- a/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
+++ b/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
@@ -34,7 +34,7 @@ AddReg=ClassAddReg
 [ClassAddReg]
 HKR,,,,"InfiniBand Channel Adapters"
 HKR,,Icon,,-5
-HKR,,SilentInstall,,0
+HKR,,SilentInstall,,1
 HKR,,"UpperFilters",0x00010000,"ibbus"	; enable IBBUS/AL Filter driver loading.
 
 
@@ -57,8 +57,8 @@ mlx4u.dll = 1,,
 mlx4ud.dll = 1,,
 ;wdfcoinstaller01005.dll = 1,,
 ibal.dll=1,,
-complib.dll=1,,
 ibald.dll=1,,
+complib.dll=1,,
 complibd.dll=1,,
 ibbus.sys=1,,
 
@@ -98,7 +98,7 @@ ibbus.sys=1,,
 
 
 ;*****************************************
-; Mlx4Bus  Install Section
+; Mlx4HCA  Install Section
 ;*****************************************
 
 [Manufacturer]
@@ -183,7 +183,7 @@ ibbus.sys
 
 
 ;*****************************************
-; MLX4 Service Install section
+; MLX4HCA Service Install section
 ;*****************************************
 
 [MLX4HCA.ServiceInstall]
@@ -247,7 +247,8 @@ DelReg     = MLX4HCA.ParamsReg
 DelReg     = MLX4HCA.AddEventLogReg
 DelReg     = ClassAddReg
 DelFiles   = Ibal.UMCopyFiles
-
+DelFiles   = Ibbus.CopyFiles
+DelReg     = Ibbus.ParamsReg
 
 [DefaultUninstall.ntamd64]
 DelFiles   = MLX4HCA.CopyFiles
@@ -275,7 +276,7 @@ DelReg     = Ibbus.ParamsReg
 
 [DefaultUninstall.Services]
 DelService = Ibbus,%SPSVCINST_STOPSERVICE%
-DelService = mthca,%SPSVCINST_STOPSERVICE%
+DelService = mlx4_hca,%SPSVCINST_STOPSERVICE%
 
 
 ;
@@ -326,9 +327,9 @@ DelService = mthca,%SPSVCINST_STOPSERVICE%
 Mlx4HcaClassGuid = "{31B0B28A-26FF-4dca-A6FA-E767C7DFBA20}"
 MTL="Mellanox Technologies Ltd."
 MLX4HCA.ServiceDesc = "Mellanox ConnectX Virtual Infiband Driver"
-Ibbus.ServiceDesc = "InfiniBand Bus/Fabric/AL (Filter Driver)"
+Ibbus.ServiceDesc = "InfiniBand Bus/AL (Filter Driver)"
 Mlx4_Hca.DeviceDesc="Mellanox ConnectX Virtual Channel Adapter"
-DiskId = "Mellanox Mlx4 Bus installation disk"
+DiskId = "Mellanox Mlx4 HCA installation disk"
 SPSVCINST_NULL = 0x0
 SPSVCINST_ASSOCSERVICE = 0x00000002
 SPSVCINST_STOPSERVICE  = 0x00000200
diff --git a/trunk/hw/mthca/kernel/mthca.inx b/trunk/hw/mthca/kernel/mthca.inx
index d85707fe..3aa6a6a6 100644
--- a/trunk/hw/mthca/kernel/mthca.inx
+++ b/trunk/hw/mthca/kernel/mthca.inx
@@ -190,9 +190,7 @@ complibd.dll,cl32d.dll,,2
 ibbus.sys
 
 
-;
 ; ============= MTHCA Service Install section ==============
-;
 
 [MTHCA.ServiceInstall]
 DisplayName     = %MTHCA.ServiceDesc%
@@ -225,8 +223,7 @@ HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\8bf1f640-63fe-4743-b9ef-
 HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\8bf1f640-63fe-4743-b9ef-fa38c695bfde","Level",%REG_DWORD%,0x3
 
 
-; ============= IBBUS/AL Service Install section ==============
-;
+; ============= IBBUS Service Install section ==============
 
 [Ibbus.ServiceInstall]
 DisplayName     = %Ibbus.ServiceDesc%
@@ -258,7 +255,8 @@ DelReg     = MTHCA.ParamsReg
 DelReg     = MTHCA.AddEventLogReg
 DelReg     = ClassAddReg
 DelFiles   = Ibal.UMCopyFiles
-
+DelFiles   = Ibbus.CopyFiles
+DelReg     = Ibbus.ParamsReg
 
 [DefaultUninstall.ntamd64]
 DelFiles   = MTHCA.CopyFiles
@@ -269,7 +267,8 @@ DelReg     = MTHCA.AddEventLogReg
 DelReg     = ClassAddReg
 DelFiles   = Ibal.UMCopyFiles
 DelFiles   = Ibal.WOW64CopyFiles
-
+DelFiles   = Ibbus.CopyFiles
+DelReg     = Ibbus.ParamsReg
 
 [DefaultUninstall.ntia64]
 DelFiles   = MTHCA.CopyFiles
@@ -280,7 +279,8 @@ DelReg     = MTHCA.AddEventLogReg
 DelReg     = ClassAddReg
 DelFiles   = Ibal.UMCopyFiles
 DelFiles   = Ibal.WOW64CopyFiles
-
+DelFiles   = Ibbus.CopyFiles
+DelReg     = Ibbus.ParamsReg
 
 [DefaultUninstall.Services]
 DelService = Ibbus,%SPSVCINST_STOPSERVICE%
-- 
2.46.0