[MLX4,MTHCA] fix minor typos

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

diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
index 96ba542936c0da31f0e80ba1fcc3555c2a824f23..deae787eea8aad78ece099dc34ad274913d29afc 100644 (file)
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
@@ -34,7 +34,7 @@ AddReg=ClassAddReg
 [ClassAddReg]\r
 HKR,,,,"InfiniBand Channel Adapters"\r
 HKR,,Icon,,-5\r
-HKR,,SilentInstall,,0\r
+HKR,,SilentInstall,,1\r
 HKR,,"UpperFilters",0x00010000,"ibbus" ; enable IBBUS/AL Filter driver loading.\r
 \r
 \r
@@ -57,8 +57,8 @@ mlx4u.dll = 1,,
 mlx4ud.dll = 1,,\r
 ;wdfcoinstaller01005.dll = 1,,\r
 ibal.dll=1,,\r
-complib.dll=1,,\r
 ibald.dll=1,,\r
+complib.dll=1,,\r
 complibd.dll=1,,\r
 ibbus.sys=1,,\r
 \r
@@ -98,7 +98,7 @@ ibbus.sys=1,,
 \r
 \r
 ;*****************************************\r
-; Mlx4Bus  Install Section\r
+; Mlx4HCA  Install Section\r
 ;*****************************************\r
 \r
 [Manufacturer]\r
@@ -183,7 +183,7 @@ ibbus.sys
 \r
 \r
 ;*****************************************\r
-; MLX4 Service Install section\r
+; MLX4HCA Service Install section\r
 ;*****************************************\r
 \r
 [MLX4HCA.ServiceInstall]\r
@@ -247,7 +247,8 @@ DelReg     = MLX4HCA.ParamsReg
 DelReg     = MLX4HCA.AddEventLogReg\r
 DelReg     = ClassAddReg\r
 DelFiles   = Ibal.UMCopyFiles\r
-\r
+DelFiles   = Ibbus.CopyFiles\r
+DelReg     = Ibbus.ParamsReg\r
 \r
 [DefaultUninstall.ntamd64]\r
 DelFiles   = MLX4HCA.CopyFiles\r
@@ -275,7 +276,7 @@ DelReg     = Ibbus.ParamsReg
 \r
 [DefaultUninstall.Services]\r
 DelService = Ibbus,%SPSVCINST_STOPSERVICE%\r
-DelService = mthca,%SPSVCINST_STOPSERVICE%\r
+DelService = mlx4_hca,%SPSVCINST_STOPSERVICE%\r
 \r
 \r
 ;\r
@@ -326,9 +327,9 @@ DelService = mthca,%SPSVCINST_STOPSERVICE%
 Mlx4HcaClassGuid = "{31B0B28A-26FF-4dca-A6FA-E767C7DFBA20}"\r
 MTL="Mellanox Technologies Ltd."\r
 MLX4HCA.ServiceDesc = "Mellanox ConnectX Virtual Infiband Driver"\r
-Ibbus.ServiceDesc = "InfiniBand Bus/Fabric/AL (Filter Driver)"\r
+Ibbus.ServiceDesc = "InfiniBand Bus/AL (Filter Driver)"\r
 Mlx4_Hca.DeviceDesc="Mellanox ConnectX Virtual Channel Adapter"\r
-DiskId = "Mellanox Mlx4 Bus installation disk"\r
+DiskId = "Mellanox Mlx4 HCA installation disk"\r
 SPSVCINST_NULL = 0x0\r
 SPSVCINST_ASSOCSERVICE = 0x00000002\r
 SPSVCINST_STOPSERVICE  = 0x00000200\r

diff --git a/branches/WOF2-0/trunk/hw/mthca/kernel/mthca.inx b/branches/WOF2-0/trunk/hw/mthca/kernel/mthca.inx
index d85707fe539a1ddf7e6fe0e54e562ccae0bb64aa..3aa6a6a66c00b11bf41efea61ea4357fb38acbdb 100644 (file)
--- a/branches/WOF2-0/trunk/hw/mthca/kernel/mthca.inx
+++ b/branches/WOF2-0/trunk/hw/mthca/kernel/mthca.inx
@@ -190,9 +190,7 @@ complibd.dll,cl32d.dll,,2
 ibbus.sys\r
 \r
 \r
-;\r
 ; ============= MTHCA Service Install section ==============\r
-;\r
 \r
 [MTHCA.ServiceInstall]\r
 DisplayName     = %MTHCA.ServiceDesc%\r
@@ -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\r
 \r
 \r
-; ============= IBBUS/AL Service Install section ==============\r
-;\r
+; ============= IBBUS Service Install section ==============\r
 \r
 [Ibbus.ServiceInstall]\r
 DisplayName     = %Ibbus.ServiceDesc%\r
@@ -258,7 +255,8 @@ DelReg     = MTHCA.ParamsReg
 DelReg     = MTHCA.AddEventLogReg\r
 DelReg     = ClassAddReg\r
 DelFiles   = Ibal.UMCopyFiles\r
-\r
+DelFiles   = Ibbus.CopyFiles\r
+DelReg     = Ibbus.ParamsReg\r
 \r
 [DefaultUninstall.ntamd64]\r
 DelFiles   = MTHCA.CopyFiles\r
@@ -269,7 +267,8 @@ DelReg     = MTHCA.AddEventLogReg
 DelReg     = ClassAddReg\r
 DelFiles   = Ibal.UMCopyFiles\r
 DelFiles   = Ibal.WOW64CopyFiles\r
-\r
+DelFiles   = Ibbus.CopyFiles\r
+DelReg     = Ibbus.ParamsReg\r
 \r
 [DefaultUninstall.ntia64]\r
 DelFiles   = MTHCA.CopyFiles\r
@@ -280,7 +279,8 @@ DelReg     = MTHCA.AddEventLogReg
 DelReg     = ClassAddReg\r
 DelFiles   = Ibal.UMCopyFiles\r
 DelFiles   = Ibal.WOW64CopyFiles\r
-\r
+DelFiles   = Ibbus.CopyFiles\r
+DelReg     = Ibbus.ParamsReg\r
 \r
 [DefaultUninstall.Services]\r
 DelService = Ibbus,%SPSVCINST_STOPSERVICE%\r