[ofw] RE: WinOF - Co-resident .inf files

[Yossi Leybovich]

HI

This patch fix the co-installer to search for the ib_bus.inf in
different directory.
We still need to search it in well known directory (I used "ib_core"),
pls test it 
I did not apply it  yet I will let you to play with it and then we
decide
NOTE: This is minor change but still it different from the version of
WHQL.
I guess if one will try to take 614 version with this change and pass it
WHQL there will be no new problems.
If it will work for you we can open branch based on 614 version and
patch this in.


Thanks
Yossi 


Index: tools/coinstaller/user/IbInstaller.cpp
===================================================================
--- tools/coinstaller/user/IbInstaller.cpp	(revision 2010)
+++ tools/coinstaller/user/IbInstaller.cpp	(working copy)
@@ -375,20 +375,27 @@
 	if( result )
 		return result;
 
+
+	swprintf( debug_buf ,L"[IbInstaller] path before striping
%s\n",path);
+	OutputDebugString( debug_buf );
+
+
 	// Strip the file name from the path.
 	nEnd = _tcslen( path );
 	while( path[nEnd] != '\\' )
 		nEnd--;
-/*
-	NOTE: no need to strip the platform directoty it was removed for
WHQL
-	// Skip the slash.
+
+	//Skip the slash.
 	nEnd--;
-	// Strip the platform subdir name from the path.
+	//Strip the HW subdir name from the path.
 	while( path[nEnd] != '\\' )
 		nEnd--;
-*/
-	path[nEnd] = _T('\0');
 
+	_tcsncpy( &path[nEnd+1],TEXT("ib_core"),
_tcslen(TEXT("ib_core")));
+	nEnd += _tcslen(TEXT("ib_core"));
+	
+	path[nEnd+1] = _T('\0');
+
 	swprintf( debug_buf ,L"[IbInstaller] path %s\n",path);
 	OutputDebugString( debug_buf );
 

> -----Original Message-----
> From: Smith, Stan [mailto:stan.smith at intel.com] 
> Sent: Wednesday, April 04, 2007 10:24 PM
> To: Yossi Leybovich
> Cc: Erez Cohen; Usha Srinivasan
> Subject: WinOF - Co-resident .inf files
> 
> 
> Hello,
>   Just want to express a few thoughts about the on-disk 
> structure for WinOF w.r.t. using standard Windows installer 
> features called by InstallShield and eventually WIX. 
> Specifically how it impacts ib_bus.inf & mthca.inf file locations.
> By using the MS DIF (Device Install Framework), the preferred 
> method per MS docs, the device package restriction is a 
> single .inf per directory; hence the problem with mthca.inf & 
> ib_bus.inf being collocated.
> 
> The on-disk (installed) structure wants to have 
> drivers/features in separate folders in order to work with 
> InstallShield/DIFXAPP and to faciliate Custom install 
> features such as VNIC, SRP, WSD or IPoIB.
> 
> Do we want complib.dll & ibal.dll installed into 
> \Windows\system32 or \Program Files\WinOF ?
> 
> In order not too add too many files and support future HCA 
> drivers beyond mthca, if IbInstaller.dll or a similar 
> function file, could look in IB_core\ for ib_bus.inf then the 
> following simple structure could work with InstallShield or 
> WIX installers.
> 
> 
> Program Files\WinOF
> 	IB_core\
> 		ib_bus.inf
> 		ibbus.sys
> 		ibious.sys
> 		ibal.dll
> 		ibald.dll
> 		complib.dll
> 		complibd.dll
> 		cl32.dll
> 		cl32d.dll
> 		ibal32.dll
> 		ibal32d.dll
> 	mthca\
> 		mthca.inf
> 		IbInstaller.dll
> 		mthca.sys
> 		mthcau.dll
> 		mthcaud.dll
> 		mthca32.dll
> 		mthca32d.dll
> 	IPoIB\
> 		netipoib.inf
> 		netipoib.sys
> 		ibwsd.dll
> 		ibwsd32.dll
> 	WSD\
> 		installsp.exe
> 	VNIC\
> 		netvnic.inf
> 		netvnic.sys
> 	SRP\
> 		ibsrp.sys
> 		ibsrp.inf
> 
> 	*.exe, dat*.dll, dapl*.dll, complib.dll, ibal.dll, 
> manual.htm, Release Notes.htm,
> 	 openfabrics.gif
> 
> What files and/or issues am I missing?
> 
> Thanks,
> 
> Stan.
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: coinstaller.patch
Type: application/octet-stream
Size: 1073 bytes
Desc: coinstaller.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20070405/3078f4bc/attachment.obj>