[WinOF] and so the adventure begins....2.0

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

diff --git a/branches/WinOF/WIX/CustomActions.vbs b/branches/WinOF/WIX/CustomActions.vbs
index 443f8e3ed58a3c4c08a59fe89c7fabdb3ebc7765..6c040f0b8ee84442974d9a26116d056c8ef9c543 100644 (file)
--- a/branches/WinOF/WIX/CustomActions.vbs
+++ b/branches/WinOF/WIX/CustomActions.vbs
@@ -39,12 +39,13 @@ End Function
 Sub WinOF_setup\r
     '\r
        ' Driver Install Properties:\r
-    '    0-INSTALLDIR; 1-SystemFolder; 2-System64Folder; 3-WindowsFolder\r
+    ' 0-INSTALLDIR; 1-SystemFolder; 2-System64Folder; 3-WindowsFolder ; 4-VersionNT\r
 \r
        Session.Property("DriverInstall") = Session.Property("INSTALLDIR") & _\r
                ";" & Session.Property("SystemFolder") & ";" & _\r
                Session.Property("System64Folder") & ";" & _\r
-               Session.Property("WindowsFolder")       \r
+               Session.Property("WindowsFolder") & ";" & _\r
+               Session.Property("VersionNT") \r
 \r
 End Sub\r
 \r
@@ -287,6 +288,11 @@ Function RemoveDriverFiles()
     FileDelete(Win & "lastgood\SysWOW64\ibwsd.dll")\r
     FileDelete(Win & "lastgood\SysWOW64\mthcau.dll")\r
     FileDelete(Win & "lastgood\SysWOW64\mthcaud.dll")\r
+\r
+    FileDelete(Win & "winverbs.lib")\r
+    FileDelete(sDRIVERS & "winverbs.sys")\r
+    FileDelete(sSYS32 & "winverbs.dll")\r
+    FileDelete(sSYS32 & "winverbsd.dll")\r
     \r
     ' delete opensm files\r
     Dim fso\r
@@ -635,7 +641,7 @@ Function DriverInstall()
    \r
     Dim PropArray, devID, devman, devmanEXE, devmanNET, devmanQL\r
     Dim rc, cmd, CheckMode, sInstalldir, fso\r
-       Dim DrvInstalled, IBbusGUID, idev, mlxdev\r
+       Dim DrvInstalled, idev, mlxdev, dev, dev_list\r
 \r
        On Error Resume Next\r
 \r
@@ -646,14 +652,24 @@ Function DriverInstall()
         'in defered action this is the way to pass arguments.\r
            PropArray = Split(Session.Property("CustomActionData"), ";")\r
     Else\r
-        Redim PropArray(4)\r
+        Redim PropArray(5)\r
                PropArray(0) = Session.Property("INSTALLDIR") \r
                PropArray(1) = Session.Property("SystemFolder") \r
        PropArray(2) = Session.Property("System64Folder") \r
                PropArray(3) = Session.Property("WindowsFolder")\r
+               PropArray(4) = Session.Property("VersionNT")\r
     End if\r
 \r
     sInstalldir = PropArray(0)\r
+       sVersionNT      = PropArray(4)\r
+\r
+    dpinstEXE = sInstalldir & "IBcore\dpinst.exe "\r
+    dpinstEXE1 = "..\IBcore\dpinst.exe "\r
+    dpinst =    "cmd.exe /c cd /d " & sInstalldir & "IBcore & dpinst.exe "\r
+    dpinstNET = "cmd.exe /c cd /d " & sInstalldir & "net & " & dpinstEXE1\r
+    dpinstQL =  "cmd.exe /c cd /d " & sInstalldir & "qlgcvnic & " & dpinstEXE1\r
+    dpinstSRP = "cmd.exe /c cd /d " & sInstalldir & "SRP & " & dpinstEXE1\r
+    dpinstWV =  "cmd.exe /c cd /d " & sInstalldir & "winverbs & " & dpinstEXE1\r
 \r
     devmanEXE = sInstalldir & "IBcore\devman.exe "\r
     devmanEXE1 = "..\IBcore\devman.exe "\r
@@ -661,10 +677,17 @@ Function DriverInstall()
     devmanNET = "cmd.exe /c cd /d " & sInstalldir & "net & " & devmanEXE1\r
     devmanQL =  "cmd.exe /c cd /d " & sInstalldir & "qlgcvnic & " & devmanEXE1\r
     devmanSRP = "cmd.exe /c cd /d " & sInstalldir & "SRP & " & devmanEXE1\r
+    devmanWV = "cmd.exe /c cd /d " & sInstalldir & "winverbs & " & devmanEXE1\r
 \r
     Set WshShell = CreateObject("WScript.Shell")\r
     Set fso = CreateObject("Scripting.FileSystemObject")\r
        \r
+    If Not fso.FileExists(dpinstEXE) Then\r
+        msgbox "Driver Install - missing file WinOF\" & dpinstEXE\r
+        DriverInstall=ERROR_FUNCTION_FAILED \r
+        Exit Function\r
+    End if\r
+\r
     If Not fso.FileExists(devmanEXE) Then\r
         msgbox "Driver Install - missing file WinOF\" & devmanEXE\r
         DriverInstall=ERROR_FUNCTION_FAILED \r
@@ -682,11 +705,9 @@ Function DriverInstall()
         Exit Function\r
     End if\r
                \r
-    ' Install an HCA (Host Channel Adapter) Driver\r
-       ' Install mthca 2nd as it can tolerate a previously installed IBBUS driver.\r
+    ' Install HCA (Host Channel Adapter) Driver(s)\r
 \r
     DrvInstalled = false\r
-       IBbusGUID = "{94f41ced-78eb-407c-b5df-958040af0fd8}"\r
 \r
        ' what HCAs are selected to install?\r
        have_mlx4 = 0\r
@@ -700,103 +721,74 @@ Function DriverInstall()
                have_mthca = 1\r
        End If\r
 \r
-       have_mixed_HCAs = 0\r
-       If have_mthca AND have_mlx4 Then\r
-               have_mixed_HCAs = 1\r
-       End If\r
+       dev_list = Find_PCI_devs(devman,"VEN_15B3")\r
 \r
-    ' Need to install ConnectX (mlx4) HCA driver?\r
+    ' Install ConnectX (mlx4) HCA driver?\r
 \r
     If have_mlx4 Then\r
-               ' if not mixed HCA types, then install based on Vendor ID\r
-               If have_mixed_HCAs = 0 Then\r
-                       cmd = devman & "install mlx4_bus.inf PCI\VEN_15B3"\r
-                       Return = WshShell.Run (cmd,0,true)\r
-               If Return = 0 Then\r
-                               DrvInstalled = true\r
-                       End If\r
-               Else\r
-                       ' install mlx4_bus, be specific as VEN_15B3 is not unique between\r
-                       ' mlx4 and InfiniHost (mthca) devices.\r
-\r
-                       dev_list = Find_PCI_devs(devman,"VEN_15B3")\r
-                       cmd = "No matching mlx4 Device IDs found?"\r
-               For each Dev in dev_list\r
-                               If Dev <> "" Then\r
-                                       mlxdev = Left(Dev,(Instr(dev,"SUBSYS")-2))\r
-                                       DevID = Right(mlxdev,4)\r
-                                       If IsInfiniHost( DevID ) = 0 Then\r
-                                               cmd = devman & "install mlx4_bus.inf """ & mlxdev & """"\r
-                                               Return = WshShell.Run (cmd,0,true)\r
-' msgbox "rc " & Return & " " & cmd\r
-                               If Return = 0 Then\r
-                                       DrvInstalled = true\r
-                                       Exit For\r
-                               End If\r
-                                       End if\r
+\r
+        ' install mlx4_bus, be specific as VEN_15B3 is not unique between mlx4\r
+        ' and InfiniHost (mthca) devices.\r
+\r
+               cmd = ""\r
+        For each Dev in dev_list\r
+                       If Dev <> "" Then\r
+                               mlxdev = Left(Dev,(Instr(dev,"SUBSYS")-2))\r
+                               devID = Right(mlxdev,4)\r
+                               If IsInfiniHost( devID ) = 0 Then\r
+                                       cmd = devman & "install mlx4_bus.inf """ & mlxdev & """"\r
+                                       Return = WshShell.Run (cmd,0,true)\r
+' msgbox "mlx4_bus(" & Return & ") " & cmd\r
+                       If Return = 0 Then\r
+                               DrvInstalled = true\r
+                               Exit For\r
+                       End If\r
                                End if\r
-                       Next\r
-               End if\r
+                       End if\r
+               Next\r
 \r
                If DrvInstalled <> true Then\r
-            msgbox "ConnectX HCA Install failed (" & Return & ") - " & cmd\r
-                       Return = WshShell.Run (devman & "remove " & IBbusGUID,0,true)\r
+            msgbox "mlx4_bus Install failed(" & Return & ") " & cmd\r
             DriverInstall=ERROR_INSTALL_FAILURE\r
             Exit Function\r
                End if\r
 \r
         cmd = devman & "install mlx4_hca.inf MLX4\CONNECTX_HCA"\r
         Return = WshShell.Run (cmd,0,true)\r
+\r
         ' Display error number and description if applicable\r
-        If Err Then ShowError\r
         If Return <> 0 Then\r
-            msgbox "HCA Install - mlx4_hca.inf MLX4\CONNECTX_HCA Ret=" _\r
-                     & Return & " Err=" & Err\r
+            msgbox "mlx4_hca Install Failed (" & Return & ") " & cmd\r
             DriverInstall=ERROR_INSTALL_FAILURE\r
             ' cleanup device database.\r
             Return = WshShell.Run (devman & "remove " & mlxdev, 0, true)\r
-                       Return = WshShell.Run (devman & "remove " & IBbusGUID,0,true)\r
             Exit Function\r
-        End If\r
+        End if\r
     End If\r
 \r
-    ' Need an InfiniHost (mthca) HCA driver?\r
+    ' InfiniHost (mthca) HCA driver?\r
 \r
     If have_mthca Then\r
                DrvInstalled = false\r
-               ' if not mixed HCA types, then install based on Vendor ID\r
-               If have_mixed_HCAs = 0 Then\r
-               cmd = devman & "install mthca.inf PCI\VEN_15B3"\r
-               Return = WshShell.Run (cmd,0,true)\r
-               If Return = 0 Then\r
-               DrvInstalled = true\r
-                       End If\r
-               Else\r
-                       ' install InfiniHost (mthca), be specific as VEN_15B3 is not unique\r
-                       ' between mlx4 and InfiniHost (mthca) devices.\r
-               dev_list = Find_PCI_devs(devman,"VEN_15B3")\r
-                       cmd = "No InfiniHost Device IDs found?"\r
-               For each dev in dev_list\r
-                               If dev <> "" Then\r
-                                       idev = Left(dev,(Instr(dev,"SUBSYS")-2))\r
-                                       DevID = Right(idev,4)\r
-                                       If IsInfiniHost( DevID ) = 1 Then\r
-                               cmd = devman & "install mthca.inf """ & idev & """"\r
-                               Return = WshShell.Run (cmd,0,true)\r
-                               If Return = 0 Then\r
-                                       DrvInstalled = true\r
-                                       Exit For\r
-                               End If\r
-                                       End if\r
-                               End If\r
-               Next\r
-               End If\r
+\r
+               cmd = ""\r
+        For each dev in dev_list\r
+                       If dev <> "" Then\r
+                               idev = Left(dev,(Instr(dev,"SUBSYS")-2))\r
+                               devID = Right(idev,4)\r
+                               If IsInfiniHost( devID ) = 1 Then\r
+                       cmd = devman & "update mthca.inf """ & idev & """"\r
+                       Return = WshShell.Run (cmd,0,true)\r
+                       If Return = 0 Then\r
+                               DrvInstalled = true\r
+                               Exit For\r
+                       End If\r
+                               End if\r
+                       End if\r
+        Next\r
 \r
                If DrvInstalled <> true Then\r
-            msgbox "InfiniHost(mthca) HCA Install failed (" & Return & _\r
-                                       ") - " & cmd\r
-            ' cleanup device database.\r
-                       Return = WshShell.Run (devman & "remove " & IBbusGUID,0,true)\r
+            msgbox "InfiniHost(mthca) Install failed (" & Return & ") " & cmd\r
             DriverInstall=ERROR_INSTALL_FAILURE\r
             Exit Function\r
                End if\r
@@ -814,8 +806,8 @@ Function DriverInstall()
 \r
     ' Check/install IPoIB driver\r
     If fso.FileExists(sInstalldir & "net\netipoib.inf") Then\r
-       rc = WshShell.Run (devmanNET & "update netipoib.inf IBA\IPoIB",0,true)\r
-       If Err Then ShowError\r
+               rc = WshShell.Run (devmanNET & "update netipoib.inf IBA\IPoIB",0,true)\r
+               If Err Then ShowError\r
     End If\r
     \r
        ' IB I/O Unit driver installed only if required by VNIC or SRP.\r
@@ -849,9 +841,20 @@ Function DriverInstall()
         If Err Then ShowErr2("SRP\ib_srp.inf")\r
     End if\r
 \r
-    ' append [INSTALLDIR] to system search path\r
-    ' WIX <Environment> now does this \r
-    ' SysPathAdd(sInstalldir)\r
+       If fso.FileExists(sInstalldir & "Xwinverbs\winverbs.inf") Then\r
+        cmd = devmanWV & "classfilter InfinibandController upper +winverbs"\r
+        Return = WshShell.Run (cmd,0,true)\r
+        If Return <> 1 Then msgbox "winverbs\winverbs.inf(" & Return & ")"\r
+\r
+        cmd = devmanWV & "disable =InfinibandController"\r
+        Return = WshShell.Run (cmd,0,true)\r
+        If Return <> 1 Then msgbox "winverbs\disable(" & Return & ")"\r
+\r
+        cmd = devmanWV & "enable =InfinibandController"\r
+        Return = WshShell.Run (cmd,0,true)\r
+        If Return <> 1 Then msgbox "winverbs\enable(" & Return & ")"\r
+       End If\r
+\r
     err.clear \r
     DriverInstall=0\r
 \r
@@ -945,99 +948,131 @@ End Function
 \r
 Function Uninstall_IB_Devices(sInstalldir)\r
 \r
-      Dim WshShell, fso, devices, devman, devmanRMAT\r
+       Dim WshShell, fso, devices, cmd, dpinst, devman, devmanRMAT\r
 \r
-      devman = "cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe "\r
-      devmanRMAT = devman & "remove @"\r
-      devmanDAAT = devman & "disable @"\r
+       dpinst = "cmd.exe /c cd /d " & sInstalldir & "IBcore & dpinst.exe "\r
+       dpinstNET = "cmd.exe /c cd /d " & sInstalldir & "net & ..\IBcore\dpinst.exe "\r
+       devman = "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
 \r
-      Set WshShell = CreateObject("WScript.Shell")\r
-      Set fso = CreateObject("Scripting.FileSystemObject")\r
+       devmanRMAT = devman & "remove @"\r
+       devmanDAAT = devman & "disable @"\r
 \r
-      If (fso.FileExists(sInstalldir & "IBcore\devman.exe") = False) Then\r
-          Exit Function ' no reason to continue without the tool.\r
-      End if\r
+       Set WshShell = CreateObject("WScript.Shell")\r
+       Set fso = CreateObject("Scripting.FileSystemObject")\r
+\r
+       If (fso.FileExists(sInstalldir & "IBcore\dpinst.exe") = False) Then\r
+           Exit Function ' no reason to continue without the tool.\r
+       End if\r
 \r
-      ' create a list of IBA\* devices via 'devcon findall'\r
+       If (fso.FileExists(sInstalldir & "IBcore\devman.exe") = False) Then\r
+           Exit Function ' no reason to continue without the tool.\r
+       End if\r
 \r
-      devices = FindDevices\r
+       ' create a list of IBA\* devices via 'devcon findall'\r
 \r
-      ' Remove SRP device - QLogic Virtual FC I/O controller instance?\r
-      For each deviceCan in devices\r
-          If (Instr(deviceCan,"IBA\V00066AP00000038")) Then\r
-              device = split(deviceCan, " ")\r
+       devices = FindDevices\r
+\r
+       ' Remove SRP device - QLogic Virtual FC I/O controller instance?\r
+       For each deviceCan in devices\r
+           If (Instr(deviceCan,"IBA\V00066AP00000038")) Then\r
+               device = split(deviceCan, " ")\r
                          ' disable the instance\r
-             Return = WshShell.Run (devmanDAAT & device(0), 0, true)\r
-              ' Removing I/O Unit of the SRP\r
-              Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
-          End if\r
-      Next\r
+                     Return = WshShell.Run (devmanDAAT & device(0), 0, true)\r
+               ' Removing I/O Unit of the SRP\r
+               Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
+           End if\r
+       Next\r
 \r
-      ' Removing SRP miniport devices.\r
-      ' Either: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
-      For each devTarget in devices\r
-          If (Instr(devTarget,"00C609EP0108")) Then\r
-              device = split(devTarget, " ")\r
+       ' Removing SRP miniport devices.\r
+       ' Either: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
+       For each devTarget in devices\r
+           If (Instr(devTarget,"00C609EP0108")) Then\r
+               device = split(devTarget, " ")\r
                          ' disable the instance\r
-             Return = WshShell.Run (devmanDAAT & device(0), 0, true)\r
-              ' Removing SRP\r
-              Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
-          End if\r
-      Next\r
+                     Return = WshShell.Run (devmanDAAT & device(0), 0, true)\r
+               ' Removing SRP\r
+               Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
+           End if\r
+       Next\r
 \r
-      ' Remove QLogic VNIC instances\r
-      For each devTarget in devices\r
-          If (Instr(devTarget,"IBA\V00066AP00000030")) Then\r
-              device = split(devTarget, ":")\r
-              dt = rtrim(device(0))\r
+       ' Remove QLogic VNIC instances\r
+       For each devTarget in devices\r
+           If (Instr(devTarget,"IBA\V00066AP00000030")) Then\r
+               device = split(devTarget, ":")\r
+               dt = rtrim(device(0))\r
                          ' disable the instance\r
-             Return = WshShell.Run (devmanDAAT & dt, 0, true)\r
-              ' Removing the Qlogic Vnic I/O Unit\r
+                     Return = WshShell.Run (devmanDAAT & dt, 0, true)\r
+               ' Removing the Qlogic Vnic I/O Unit\r
                          'msgbox "RmDev '" & dt & "'"\r
-              Return = WshShell.Run (devmanRMAT & dt, 0, true)\r
-          End if\r
-      Next\r
+               Return = WshShell.Run (devmanRMAT & dt, 0, true)\r
+           End if\r
+       Next\r
 \r
-      ' remove any lingering IB I/O Units\r
-      For each devTarget in devices\r
-          If (Instr(devTarget,"IBA\IB_IOU")) Then\r
-              device = split(devTarget, ":")\r
-              dt = rtrim(device(0))\r
-             Return = WshShell.Run (devmanDAAT & dt, 0, true)\r
-              ' Removing the I/O Unit\r
+       ' remove any lingering IB I/O Units\r
+       For each devTarget in devices\r
+           If (Instr(devTarget,"IBA\IB_IOU")) Then\r
+               device = split(devTarget, ":")\r
+               dt = rtrim(device(0))\r
+                     Return = WshShell.Run (devmanDAAT & dt, 0, true)\r
+               ' Removing the I/O Unit\r
                          'msgbox "RmDev '" & dt & "'"\r
-              Return = WshShell.Run (devmanRMAT & dt, 0, true)\r
-          End if\r
-      Next\r
-      Return = WshShell.Run (devman & "remove IBA\IB_IOU*",0,true)\r
+               Return = WshShell.Run (devmanRMAT & dt, 0, true)\r
+           End if\r
+       Next\r
 \r
          ' Disable and Remove IPoIB devices\r
-      Return = WshShell.Run (devmanDAAT & "IBA\IPOIB\*", 0, true)\r
-      Return = WshShell.Run (devmanRMAT & "IBA\IPOIB\*", 0, true)\r
+       Return = WshShell.Run (devmanDAAT & "IBA\IPOIB\*", 0, true)\r
+       Return = WshShell.Run (devmanRMAT & "IBA\IPOIB\*", 0, true)\r
 \r
-      ' Disable & Remove HCAs\r
+       ' uninstall netipoib.inf files\r
+       cmd = dpinstNET & "/U """ & sInstalldir & "net" & "\netipoib.inf"" /S /D"\r
 \r
-      Return = WshShell.Run (devmanDAAT & "PCI\VEN_15B3*", 0, true)\r
-      Return = WshShell.Run (devmanRMAT & "PCI\VEN_15B3*", 0, true)\r
+       ' Disable & Remove HCAs\r
 \r
-      ' ibbus GUID\r
-      Return = WshShell.Run (devman & "remove {94F41CED-78EB-407C-B5DF-958040AF0FD8",0,true)\r
-      Return = WshShell.Run (devmanRMAT & "ROOT\INFINIBANDCONTROLLER\*",0,true)\r
-      Return = WshShell.Run (devmanRMAT & "MLX4\CONNECTX_HCA\*", 0, true)\r
+       Return = WshShell.Run (devmanDAAT & "PCI\VEN_15B3*", 0, true)\r
+       Return = WshShell.Run (devmanRMAT & "PCI\VEN_15B3*", 0, true)\r
 \r
-      ' Remove InfiniBand Bus/Fabric class driver\r
+       ' ibbus GUID\r
+       Return = WshShell.Run (devman & "remove {94F41CED-78EB-407C-B5DF-958040AF0FD8",0,true)\r
+       Return = WshShell.Run (devmanRMAT & "ROOT\INFINIBANDCONTROLLER\*",0,true)\r
+       Return = WshShell.Run (devmanRMAT & "MLX4\CONNECTX_HCA\*", 0, true)\r
 \r
-      Set objWScriptExec = wshShell.Exec(devman & "FindAll * | FIND ""InfiniBand Fabric"" ")\r
-      If Err Then ShowError\r
+       ' Remove InfiniBand Bus/Fabric class driver\r
+\r
+       Set objWScriptExec = wshShell.Exec(devman & "FindAll * | FIND ""InfiniBand Fabric"" ")\r
+       If Err Then ShowError\r
+\r
+       Set objStdOut = objWScriptExec.StdOut\r
+\r
+       While Not objStdOut.AtEndOfStream\r
+           strLine = objStdOut.ReadLine\r
+           device = split(strLine, " ")\r
+           Return = wshShell.Run(devmanRMAT & device(0),0,true)\r
+           If Err Then ShowError\r
+       Wend\r
+\r
+       ' uninstall HCA xxx.inf files\r
+\r
+       If fso.FileExists(sInstalldir & "IBcore\ib_iou.inf") Then\r
+               cmd = dpinst & "/U """ & sInstalldir & "IBcore\ib_iou.inf"" /S /D"\r
+               Return = WshShell.Run (cmd, 0, true)\r
+       End if\r
+\r
+       If fso.FileExists(sInstalldir & "IBcore\mthca.inf") Then\r
+               cmd = dpinst & "/U """ & sInstalldir & "IBcore\mthca.inf"" /S /D"\r
+               Return = WshShell.Run (cmd, 0, true)\r
+       End if\r
+\r
+       If fso.FileExists(sInstalldir & "IBcore\mlx4_hca.inf") Then\r
+\r
+               cmd = dpinst & "/U """ & sInstalldir & "IBcore\mlx4_hca.inf"" /S /D"\r
+               Return = WshShell.Run (cmd, 0, true)\r
 \r
-      Set objStdOut = objWScriptExec.StdOut\r
+               cmd = dpinst & "/U """ & sInstalldir & "IBcore\mlx4_bus.inf"" /S /D"\r
+               Return = WshShell.Run (cmd, 0, true)\r
+       End if\r
 \r
-      While Not objStdOut.AtEndOfStream\r
-          strLine = objStdOut.ReadLine\r
-          device = split(strLine, " ")\r
-          Return = wshShell.Run(devmanRMAT & device(0),0,true)\r
-          If Err Then ShowError\r
-      Wend\r
+       Uninstall_IB_Devices = 0\r
 \r
 End Function\r
 \r

diff --git a/branches/WinOF/WIX/README_release.txt b/branches/WinOF/WIX/README_release.txt
index aa23dadf1baeadb630cb0f07ef75aa47ac6eb242..0aa54f994ae10c2be4a8afec73ea659352778cfb 100644 (file)
--- a/branches/WinOF/WIX/README_release.txt
+++ b/branches/WinOF/WIX/README_release.txt
@@ -6,11 +6,11 @@ WinOF 2.0 Summary Changes
 -------------------------\r
 \r
 1) WinOF 2.0 release based on openib-windows svn source revision\r
-   (branches\WOF2-0 svn.1504).\r
+   (branches\WOF2-0 svn.1516).\r
 \r
    Last WinOF release (1.1) based on svn 1177.\r
 \r
-2) Stability enhancements in\r
+2) Stability enhancements (TBA)\r
    IB Core\r
         BSOD nonexistant GUID in registry fixed.\r
    IPoIB       \r
@@ -34,13 +34,15 @@ WinOF 2.0 Summary Changes
    IPoIB:\r
        multicast garbage collector.\r
        IGMPv2 support.\r
+       Partitioning support\r
 \r
    WinVerbs: OFED verbs API for Windows\r
 \r
-5) Drivers digitally signed by the OpenFabrics Alliance\r
+4) Drivers digitally signed by the OpenFabrics Alliance\r
 \r
-4) WinOF symbol store available.\r
-   Point windbg at http://www.openfabrics.org/downloads/WinOF/v2.0/{wlh,wnet,wxp}/SymStor\r
+5) WinOF symbol store available.\r
+   Point windbg at\r
+       http://www.openfabrics.org/downloads/WinOF/v2.0/{wlh,wnet,wxp}/SymStor\r
 \r
 \r
 \r

diff --git a/branches/WinOF/WIX/Release_notes.htm b/branches/WinOF/WIX/Release_notes.htm
index db461d8bebe763a14adfacbee6b3232a84564bd9..02e42781afa913c29a496cc45ff00aac3e29e3bb 100644 (file)
--- a/branches/WinOF/WIX/Release_notes.htm
+++ b/branches/WinOF/WIX/Release_notes.htm
@@ -92,7 +92,7 @@ src=openfabrics.gif></h1>
 <h1 align=center style='text-align:center'><a name="1.1_Release_Notes">2.0 Release Notes</a></h1>\r
 \r
 <h3 align=center style='text-align:center'>\r
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->08/25/2008<!--webbot bot="Timestamp" endspan i-checksum="12604" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->08/26/2008<!--webbot bot="Timestamp" endspan i-checksum="12620" --></h3>\r
 \r
 <div class=MsoNormal align=center style='text-align:center'>\r
 \r
@@ -145,7 +145,7 @@ InfiniBand fabric.</span></p>
 <p class=MsoPlainText><span style='font-size:12.0pt;font-family:"Times New Roman"'>&nbsp;Binary\r
 files generated from the OpenIB-windows developers subversion (svn) source tree </span>\r
 'svn://openib.tc.cornell.edu'<span style='font-size:12.0pt;font-family:"Times New Roman"'> \r
-(branches\WOF1-1 svn revision <font color="#FF0000">1504</font>)\r
+(branches\WOF2-0 svn revision <font color="#FF0000">1516</font>)\r
 are packaged into a <a href="http://www.dalun.com/wix/default.htm">WIX 2.0 \r
 (Windows Installer Xml)</a> single file install package referred to as the \r
 Windows OpenFabrics&nbsp;(WinOF) release 2.0.<br>\r
@@ -158,10 +158,10 @@ to numerous components:</span></font></p>
 <ul>\r
        <li>\r
        <p class="MsoPlainText"><font face="Times New Roman" size="3">Windows Server \r
-       2008 and Vista are now support.</font></p></li>\r
+       2008 and Vista are now supported.</font></p></li>\r
        <li>\r
-       <p class="MsoPlainText"><font face="Times New Roman" size="3">Mellanox has \r
-       ConnectX(mlx4) drivers for increased stability.</font></p></li>\r
+       <p class="MsoPlainText"><font face="Times New Roman" size="3">Mellanox ConnectX(mlx4) drivers \r
+       enhanced for increased stability.</font></p></li>\r
        <li>\r
        <p class="MsoPlainText"><font face="Times New Roman" size="3">QLogic has \r
        enhanced VNIC &amp; SRP for increased stability.</font></p></li>\r
@@ -964,9 +964,9 @@ Once completed, the &quot;New Hardware Found&quot; Wizard pops up again.<br>
        enable &gt; 4KB transfers to proceed without hanging.</font></span><font size="3" face="Times New Roman"><span style="background-color: #FFFFFF"><br>\r
 &nbsp;</span></font></p></li>\r
        <li>\r
-       <p class=MsoPlainText><font face="Times New Roman" size="3">The latest round of MS patches to Window Server 2003 (R2) \r
-       SP2 contain the WSD hotfix which addresses observed WSD problems in pre SP2 \r
-       Windows Server 2003. Most users will not need to apply this hotfix.</font><br>&nbsp;<font face="Times New Roman" size="3"><br>&nbsp;</font></p></li>\r
+       <p class=MsoPlainText><font face="Times New Roman" size="3">Winsock Direct \r
+       hotfix xxxxxxx for Windows Server 2003 is a good patch to apply if you are \r
+       using WSD/IPoIB.</font><br>&nbsp;<font face="Times New Roman" size="3"><br>&nbsp;</font></p></li>\r
 </ul>\r
 <p class=MsoPlainText><a href="#1.1_Release_Notes"><font color="#000000">\r
 &lt;Return-to-Top&gt;</font></a><br>\r