[IBAL/MTHCA/IPOIB/TOOLS] fix inf to search driver in the same directory (not to use...

fix co-installer accordingly

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

diff --git a/trunk/core/bus/kernel/ib_bus.inf b/trunk/core/bus/kernel/ib_bus.inf
index 828ded8e94b58ec1ad46d9952675092baf53ad33..bb16f9cc4568d4deb44deac2be180508c83ddec2 100644 (file)
--- a/trunk/core/bus/kernel/ib_bus.inf
+++ b/trunk/core/bus/kernel/ib_bus.inf
@@ -19,13 +19,13 @@ Ibbus.UMCopyFiles=%DIRID_SYSTEM%
 Ibbus.WOW64CopyFiles=%DIRID_SYSTEM_X86%\r
 \r
 [SourceDisksNames.x86]\r
-1=%DiskId%,,,\x86\r
+1=%DiskId%,,,""\r
 \r
 [SourceDisksNames.amd64]\r
-1=%DiskId%,,,\amd64\r
+1=%DiskId%,,,""\r
 \r
 [SourceDisksNames.ia64]\r
-1=%DiskId%,,,\ia64\r
+1=%DiskId%,,,""\r
 \r
 [SourceDisksFiles.x86]\r
 ibbus.sys=1\r

diff --git a/trunk/hw/mthca/kernel/mthca.inf b/trunk/hw/mthca/kernel/mthca.inf
index f2245de0d9d0d9b8951d5de106080f9fac31e7b3..00bf06259e07c0b8463cfb1dbac88f20290ac4b4 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca.inf
+++ b/trunk/hw/mthca/kernel/mthca.inf
@@ -36,13 +36,13 @@ HKLM,"System\CurrentControlSet\Control\CoDeviceInstallers", \
 ; ================= Device Install section =====================\r
 \r
 [SourceDisksNames.x86]\r
-1=%DiskId%,,,\x86\r
+1=%DiskId%,,,""\r
 \r
 [SourceDisksNames.amd64]\r
-1=%DiskId%,,,\amd64\r
+1=%DiskId%,,,""\r
 \r
 [SourceDisksNames.ia64]\r
-1=%DiskId%,,,\ia64\r
+1=%DiskId%,,,""\r
 \r
 [SourceDisksFiles]\r
 IbInstaller.dll=1\r

diff --git a/trunk/tools/coinstaller/user/IbInstaller.cpp b/trunk/tools/coinstaller/user/IbInstaller.cpp
index 31b9a36bec271d1e5623b95e1055da69c755cca6..d3a7e7b2a2333fceea8e83b9482cc5186e1ca108 100644 (file)
--- a/trunk/tools/coinstaller/user/IbInstaller.cpp
+++ b/trunk/tools/coinstaller/user/IbInstaller.cpp
@@ -35,6 +35,7 @@
 \r
 #include "stdafx.h"\r
 \r
+wchar_t  debug_buf[256];\r
 \r
 // IB Fabric device HW ID\r
 #define GUID_IB_BUS_HW_ID      TEXT("{94f41ced-78eb-407c-b5df-958040af0fd8}")\r
@@ -80,8 +81,8 @@ DWORD NeedInstall()
        hDevList = SetupDiGetClassDevs( &GUID_CLASS_SYSTEM, 0, NULL, 0 );\r
        if( hDevList == INVALID_HANDLE_VALUE )\r
        {\r
-               OutputDebugString(\r
-                       TEXT("Failed to get system class dev info list.\n") );\r
+               swprintf( debug_buf,L"[IbInstaller] Failed to get system class dev info list Error %d\n",GetLastError());\r
+               OutputDebugString( debug_buf );\r
                return GetLastError();\r
        }\r
 \r
@@ -133,13 +134,15 @@ DWORD SelectDriver(
 {\r
        DWORD   i;\r
        BOOL    bSuccess;\r
+       \r
 \r
        // Get a list of drivers.\r
        bSuccess =\r
                SetupDiBuildDriverInfoList( hDevList, pDevInfo, SPDIT_CLASSDRIVER );\r
        if( !bSuccess )\r
        {\r
-               OutputDebugString( TEXT("SetupDiBuildDriverInfoList failed.\n") );\r
+               swprintf( debug_buf,L"[IbInstaller] SetupDiBuildDriverInfoList failed Error %d\n",GetLastError());\r
+               OutputDebugString( debug_buf );\r
                return GetLastError();\r
        }\r
 \r
@@ -150,14 +153,20 @@ DWORD SelectDriver(
        i = 0;\r
        do\r
        {\r
+\r
                bSuccess = SetupDiEnumDriverInfo( hDevList, pDevInfo,\r
                        SPDIT_CLASSDRIVER, i++, pDrvInfo );\r
                if( !bSuccess )\r
                {\r
-                       OutputDebugString( TEXT("SetupDiEnumDriverInfo failed.\n") );\r
+                       swprintf( debug_buf,L"[IbInstaller] SetupDiEnumDriverInfo failed Error %d\n",GetLastError());\r
+                       OutputDebugString( debug_buf );\r
                        break;\r
                }\r
 \r
+               // make the string\r
+               swprintf( debug_buf,TEXT("[IbInstaller]  pDrvInfo->Description %s\n"),pDrvInfo->Description);\r
+               OutputDebugString( debug_buf );\r
+               \r
                if( _tcscmp( pDrvInfo->Description, DEVICE_DESC ) )\r
                        continue;\r
 \r
@@ -182,6 +191,7 @@ CreateIbBusRoot(
        LONG                                    status;\r
        SP_DEVINSTALL_PARAMS    installParams;\r
 \r
+\r
        memset( &devInfo, 0, sizeof(SP_DEVINFO_DATA) );\r
        devInfo.cbSize = sizeof(SP_DEVINFO_DATA);\r
 \r
@@ -369,14 +379,20 @@ IbCoInstaller(
        nEnd = _tcslen( path );\r
        while( path[nEnd] != '\\' )\r
                nEnd--;\r
+/*\r
+       NOTE: no need to strip the platform directoty it was removed for WHQL\r
        // Skip the slash.\r
        nEnd--;\r
        // Strip the platform subdir name from the path.\r
        while( path[nEnd] != '\\' )\r
                nEnd--;\r
-\r
+*/\r
        path[nEnd] = _T('\0');\r
 \r
+       swprintf( debug_buf ,L"[IbInstaller] path %s\n",path);\r
+       OutputDebugString( debug_buf );\r
+\r
+\r
        // Create the bus root.\r
        result = CreateIbBusRoot( path );\r
        if( result != ERROR_SUCCESS )\r

diff --git a/trunk/tools/coinstaller/user/SOURCES b/trunk/tools/coinstaller/user/SOURCES
index 6aed6954708c2759161c2e40910563b40c643045..b50482c257cbc3ea2bdc106c4c1023e4ba6717e7 100644 (file)
--- a/trunk/tools/coinstaller/user/SOURCES
+++ b/trunk/tools/coinstaller/user/SOURCES
@@ -8,6 +8,8 @@ SOURCES= IbInstaller.rc         \
 PRECOMPILED_INCLUDE=stdafx.h\r
 PRECOMPILED_CXX=1\r
 \r
+USE_MSVCRT=1\r
+\r
 C_DEFINES=$(C_DEFINES) -DUNICODE -D_UNICODE\r
 \r
 TARGETLIBS=$(SDK_LIB_PATH)\setupapi.lib                \\r

diff --git a/trunk/ulp/ipoib/kernel/netipoib.inf b/trunk/ulp/ipoib/kernel/netipoib.inf
index 45b601da1bc4131d6d555d0b429c8ea47ebcac06..c5382408ec72e6fadddcf37eece04cf56ba2d7d7 100644 (file)
--- a/trunk/ulp/ipoib/kernel/netipoib.inf
+++ b/trunk/ulp/ipoib/kernel/netipoib.inf
@@ -157,13 +157,13 @@ ibwsd.dll,,,0x00000002
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
 \r
 [SourceDisksNames.x86]\r
-1 = %IcsDisk1%,,,\x86\r
+1 = %IcsDisk1%,,,""\r
 \r
 [SourceDisksNames.amd64]\r
-1 = %IcsDisk1%,,,\amd64\r
+1 = %IcsDisk1%,,,""\r
 \r
 [SourceDisksNames.ia64]\r
-1 = %IcsDisk1%,,,\ia64\r
+1 = %IcsDisk1%,,,""\r
 \r
 [SourceDisksFiles.x86]\r
 ipoib.sys = 1\r