[ofw] [PATCH] equalize mthca.inx and mlx4_hca.inx

[Reuven Amitai]

Hi,
 
The patch equalize mthca.inx and mlx4_hca.inx and fix minor typos:
mthca instead of mlx4_hca, MLX4HCA instead of MLX4BUS, adding ibbus
sections to DeafultUninstall section.
 
Thanks, Reuven.
 
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Index: hw/mlx4/kernel/hca/mlx4_hca.inx
===================================================================
--- hw/mlx4/kernel/hca/mlx4_hca.inx (revision 1656)
+++ hw/mlx4/kernel/hca/mlx4_hca.inx (working copy)
@@ -34,7 +34,7 @@
 [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 @@
 mlx4ud.dll = 1,,
 ;wdfcoinstaller01005.dll = 1,,
 ibal.dll=1,,
+ibald.dll=1,,
 complib.dll=1,,
-ibald.dll=1,,
 complibd.dll=1,,
 ibbus.sys=1,,
 
@@ -98,7 +98,7 @@
 
 
 ;*****************************************
-; Mlx4Bus  Install Section
+; Mlx4HCA  Install Section
 ;*****************************************
 
 [Manufacturer]
@@ -183,7 +183,7 @@
 
 
 ;*****************************************
-; MLX4 Service Install section
+; MLX4HCA Service Install section
 ;*****************************************
 
 [MLX4HCA.ServiceInstall]
@@ -247,8 +247,9 @@
 DelReg     = MLX4HCA.AddEventLogReg
 DelReg     = ClassAddReg
 DelFiles   = Ibal.UMCopyFiles
+DelFiles   = Ibbus.CopyFiles
+DelReg     = Ibbus.ParamsReg
 
-
 [DefaultUninstall.ntamd64]
 DelFiles   = MLX4HCA.CopyFiles
 DelFiles   = MLX4HCA.UMCopyFiles
@@ -275,7 +276,7 @@
 
 [DefaultUninstall.Services]
 DelService = Ibbus,%SPSVCINST_STOPSERVICE%
-DelService = mthca,%SPSVCINST_STOPSERVICE%
+DelService = mlx4_hca,%SPSVCINST_STOPSERVICE%
 
 
 ;
@@ -326,9 +327,9 @@
 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
Index: hw/mthca/kernel/mthca.inx
===================================================================
--- hw/mthca/kernel/mthca.inx (revision 1656)
+++ hw/mthca/kernel/mthca.inx (working copy)
@@ -190,9 +190,7 @@
 ibbus.sys
 
 
-;
 ; ============= MTHCA Service Install section ==============
-;
 
 [MTHCA.ServiceInstall]
 DisplayName     = %MTHCA.ServiceDesc%
@@ -225,8 +223,7 @@
 
HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\8bf1f640-63fe-47
43-b9ef-fa38c695bfde","Level",%REG_DWORD%,0x3
 
 
-; ============= IBBUS/AL Service Install section ==============
-;
+; ============= IBBUS Service Install section ==============
 
 [Ibbus.ServiceInstall]
 DisplayName     = %Ibbus.ServiceDesc%
@@ -258,8 +255,9 @@
 DelReg     = MTHCA.AddEventLogReg
 DelReg     = ClassAddReg
 DelFiles   = Ibal.UMCopyFiles
+DelFiles   = Ibbus.CopyFiles
+DelReg     = Ibbus.ParamsReg
 
-
 [DefaultUninstall.ntamd64]
 DelFiles   = MTHCA.CopyFiles
 DelFiles   = MTHCA.UMCopyFiles
@@ -269,8 +267,9 @@
 DelReg     = ClassAddReg
 DelFiles   = Ibal.UMCopyFiles
 DelFiles   = Ibal.WOW64CopyFiles
+DelFiles   = Ibbus.CopyFiles
+DelReg     = Ibbus.ParamsReg
 
-
 [DefaultUninstall.ntia64]
 DelFiles   = MTHCA.CopyFiles
 DelFiles   = MTHCA.UMCopyFiles
@@ -280,8 +279,9 @@
 DelReg     = ClassAddReg
 DelFiles   = Ibal.UMCopyFiles
 DelFiles   = Ibal.WOW64CopyFiles
+DelFiles   = Ibbus.CopyFiles
+DelReg     = Ibbus.ParamsReg
 
-
 [DefaultUninstall.Services]
 DelService = Ibbus,%SPSVCINST_STOPSERVICE%
 DelService = mthca,%SPSVCINST_STOPSERVICE%
    
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20081016/b4c56b89/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mthca_mlx4_hca.patch
Type: application/octet-stream
Size: 3657 bytes
Desc: mthca_mlx4_hca.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20081016/b4c56b89/attachment.obj>