[Openib-windows] [PATCH] MTHCA: Fixup INF for consistency

[Fab Tillier]

Hi Leo,

Here's a pretty trivial patch to the MTHCA INF.  I checked in some changes
already to remove the dependency on ibal.sys when I checked in the changes to
make KAL a static library so that the INF wasn't left broken.  Here are some
extra changes:

- Change the "Provider" field to reference OpenIB
- Remove the mention of the catalog file, as it can mess up driver updates.
We'll add the line once we have the drivers certified.
- I updated the version.  I didn't update the one in MTHCA_DEV.h, and will
create a patch to pull this from the version header so that it's automatic.
- Changed %DIRID_WINDOWS%\SysWOW64 to %DIRID_SYSTEM_X86% as that's the correct
definition.  I know the chkinf tool doesn't like it, but that's a deficiency in
the tool.  It's better to use the ID, in case the directory name gets changed in
a future version.
- Renamed the 32-bit UVP files from uvp32 and uvp32d to mthca32 and mthca32d so
that both the MT23108 and MTHCA driver binaries can coexist in the same
directory.

Note that the device manufacturer still is displayed as Mellanox - only the
provider of the INF file was changed to OpenIB.  The HCAs thus still have
Mellanox branding as they should.

- Fab

Index: hw/mthca/kernel/mthca.inf
===================================================================
--- hw/mthca/kernel/mthca.inf	(revision 293)
+++ hw/mthca/kernel/mthca.inf	(working copy)
@@ -5,10 +5,9 @@
 Signature="$Windows NT$"
 Class=InfiniBandHca
 ClassGUID={58517E00-D3CF-40c9-A679-CEE5752F4491}
-Provider=%MTL%
-CatalogFile=mthca.cat
+Provider=%OPENIB%
 ; must be synchronized with MTHCA_DEV.H
-DriverVer=03/01/2006,1.0.4
+DriverVer=03/31/2006,1.0.0000.267
 
 ; ================= Destination directory section =====================
 
@@ -16,7 +15,7 @@
 DefaultDestDir=%DIRID_DRIVERS%
 ClassCopyFiles=%DIRID_SYSTEM%
 MTHCA.UMCopyFiles=%DIRID_SYSTEM%
-MTHCA.WOW64CopyFiles=%DIRID_WINDOWS%\SysWOW64
+MTHCA.WOW64CopyFiles=%DIRID_SYSTEM_X86%
 
 ; ================= Class Install section =====================
 
@@ -55,16 +54,16 @@
 mthca.sys=1
 mthcau.dll=1
 mthcaud.dll=1
-;uvpd32.dll=1
-;uvpd32d.dll=1
+mthca32.dll=1
+mthca32d.dll=1
 
 [SourceDisksFiles.ia64]
 IbInstaller.dll=1
 mthca.sys=1
 mthcau.dll=1
 mthcaud.dll=1
-;uvpd32.dll=1
-;uvpd32d.dll=1
+mthca32.dll=1
+mthca32d.dll=1
 
 [Manufacturer]
 %MTL% = HCA.DeviceSection,ntx86,ntamd64,ntia64
@@ -79,7 +78,6 @@
 %MT24204.DeviceDesc% = MTHCA.DDInstall, PCI\VEN_15B3&DEV_5E8C
 %MT25204.DeviceDesc% = MTHCA.DDInstall, PCI\VEN_15B3&DEV_6274
 
-
 [HCA.DeviceSection.ntamd64]
 %MT23108.DeviceDesc% = MTHCA.DDInstall, PCI\VEN_15B3&DEV_5A44
 %MT25208.DeviceDesc% = MTHCA.DDInstall, PCI\VEN_15B3&DEV_6278
@@ -121,13 +119,12 @@
 mthca.sys
 
 [MTHCA.UMCopyFiles]
-; 2 lines excluded temporary
 mthcau.dll,,,2
 mthcaud.dll,,,2
 
 [MTHCA.WOW64CopyFiles]
-mthcau.dll,uvpd32.dll,,2
-mthcaud.dll,uvpd32d.dll,,2
+mthcau.dll,mthca32.dll,,2
+mthcaud.dll,mthca32d.dll,,2
 
 ;
 ; ============= Service Install section ==============
@@ -158,6 +155,7 @@
 
 [Strings]
 HcaClassGuid = "{58517E00-D3CF-40c9-A679-CEE5752F4491}"
+OPENIB = "OpenIB Alliance"
 MTL="Mellanox Technologies Ltd."
 MTHCA.ServiceDesc = "Driver for Mellanox InfiniHost Devices"
 MT23108.DeviceDesc="InfiniHost (MT23108) - Mellanox InfiniBand HCA"
@@ -175,3 +173,4 @@
 REG_MULTI_SZ_APPEND    = 0x00010008
 DIRID_SYSTEM           = 11
 DIRID_DRIVERS          = 12
+DIRID_SYSTEM_X86       = 16425
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mthca_inf.patch
Type: application/octet-stream
Size: 2205 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20060409/3861725c/attachment.obj>