From e4d6f4e1cb67a8b5b0ed2860c664ce69f6be7899 Mon Sep 17 00:00:00 2001 From: ftillier Date: Sun, 9 Apr 2006 19:06:50 +0000 Subject: [PATCH] [IBAL, IBBUS, MT23108, MTHCA] Make KAL static library - Move driver initialization from al_driver.c to bus_driver.c - Fix up INF files that referenced IBAL. - Kernel ALTS test suite is stale, removed from build. git-svn-id: svn://openib.tc.cornell.edu/gen1@293 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/core/al/kernel/SOURCES | 3 +- trunk/core/al/kernel/al_driver.c | 273 ------------------------- trunk/core/bus/kernel/bus_driver.c | 105 +++++++++- trunk/core/bus/kernel/ib_bus.inf | 91 +++------ trunk/hw/mt23108/kernel/infinihost.inf | 47 ++--- trunk/hw/mthca/kernel/mthca.inf | 24 --- trunk/inc/iba/ib_types.h | 16 +- trunk/tests/alts/dirs | 2 +- 8 files changed, 149 insertions(+), 412 deletions(-) delete mode 100644 trunk/core/al/kernel/al_driver.c diff --git a/trunk/core/al/kernel/SOURCES b/trunk/core/al/kernel/SOURCES index 1d2001f3..bb830731 100644 --- a/trunk/core/al/kernel/SOURCES +++ b/trunk/core/al/kernel/SOURCES @@ -1,6 +1,6 @@ TARGETNAME=ibal TARGETPATH=..\..\..\bin\kernel\obj$(BUILD_ALT_DIR) -TARGETTYPE=EXPORT_DRIVER +TARGETTYPE=DRIVER_LIBRARY DLLDEF=al_exports.def @@ -9,7 +9,6 @@ SOURCES= ibal.rc \ al_ci_ca.c \ al_cm_cep.c \ al_dev.c \ - al_driver.c \ al_ioc_pnp.c \ al_mad_pool.c \ al_mgr.c \ diff --git a/trunk/core/al/kernel/al_driver.c b/trunk/core/al/kernel/al_driver.c deleted file mode 100644 index 96320c65..00000000 --- a/trunk/core/al/kernel/al_driver.c +++ /dev/null @@ -1,273 +0,0 @@ -/* - * Copyright (c) 2005 SilverStorm Technologies. All rights reserved. - * - * This software is available to you under the OpenIB.org BSD license - * below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * $Id$ - */ - - -// -// Provides the driver entry points for the Access Layer. -// - -#include -#include "al_init.h" -#include "al_mgr.h" -#include "al_debug.h" -/* Safe string functions. */ -#if WINVER == 0x500 -/* - * Windows 2000 doesn't support the inline version of safe strings. - * Force the use of the library version of safe strings. - */ -#define NTSTRSAFE_LIB -#endif -#include - - -#define DEFAULT_NODE_DESC "SilverStorm Technologies Windows® Host" - - -char node_desc[IB_NODE_DESCRIPTION_SIZE]; - - -static void -__read_machine_name( void ); - -static NTSTATUS -__read_registry( - IN UNICODE_STRING* const p_registry_path ); - -NTSTATUS -DriverEntry( - IN DRIVER_OBJECT *p_driver_obj, - IN UNICODE_STRING *p_registry_path ); - -NTSTATUS -DllInitialize( - IN UNICODE_STRING *p_registry_path ); - -NTSTATUS -DllUnload( void ); - - -#ifdef ALLOC_PRAGMA -#pragma alloc_text (INIT, DriverEntry) -#pragma alloc_text (INIT, DllInitialize) -#pragma alloc_text (INIT, __read_machine_name) -#pragma alloc_text (INIT, __read_registry) -#pragma alloc_text (PAGE, DllUnload) -#endif - - -static void -__read_machine_name( void ) -{ - NTSTATUS status; - /* Remember the terminating entry in the table below. */ - RTL_QUERY_REGISTRY_TABLE table[2]; - UNICODE_STRING hostNamePath; - UNICODE_STRING hostNameW; - ANSI_STRING hostName; - - AL_ENTER( AL_DBG_DEV ); - - /* Get the host name. */ - RtlInitUnicodeString( &hostNamePath, L"ComputerName\\ComputerName" ); - RtlInitUnicodeString( &hostNameW, NULL ); - - /* - * Clear the table. This clears all the query callback pointers, - * and sets up the terminating table entry. - */ - cl_memclr( table, sizeof(table) ); - cl_memclr( node_desc, sizeof(node_desc) ); - - /* Setup the table entries. */ - table[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - table[0].Name = L"ComputerName"; - table[0].EntryContext = &hostNameW; - table[0].DefaultType = REG_SZ; - table[0].DefaultData = &hostNameW; - table[0].DefaultLength = 0; - - /* Have at it! */ - status = RtlQueryRegistryValues( RTL_REGISTRY_CONTROL, - hostNamePath.Buffer, table, NULL, NULL ); - if( NT_SUCCESS( status ) ) - { - /* Convert the UNICODE host name to UTF-8 (ASCII). */ - hostName.Length = 0; - hostName.MaximumLength = sizeof(node_desc); - hostName.Buffer = node_desc; - status = RtlUnicodeStringToAnsiString( &hostName, &hostNameW, FALSE ); - RtlFreeUnicodeString( &hostNameW ); - } - else - { - AL_TRACE( AL_DBG_ERROR, ("Failed to get host name.\n") ); - /* Use the default name... */ - RtlStringCbCopyNA( node_desc, sizeof(node_desc), - DEFAULT_NODE_DESC, sizeof(DEFAULT_NODE_DESC) ); - } - - AL_EXIT( AL_DBG_DEV ); -} - -static NTSTATUS -__read_registry( - IN UNICODE_STRING* const p_registry_path ) -{ - NTSTATUS status; - /* Remember the terminating entry in the table below. */ - RTL_QUERY_REGISTRY_TABLE table[6]; - UNICODE_STRING param_path; - - AL_ENTER( AL_DBG_DEV ); - - __read_machine_name(); - - RtlInitUnicodeString( ¶m_path, NULL ); - param_path.MaximumLength = p_registry_path->Length + - sizeof(L"\\Parameters"); - param_path.Buffer = cl_zalloc( param_path.MaximumLength ); - if( !param_path.Buffer ) - { - AL_TRACE_EXIT( AL_DBG_ERROR, - ("Failed to allocate parameters path buffer.\n") ); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlAppendUnicodeStringToString( ¶m_path, p_registry_path ); - RtlAppendUnicodeToString( ¶m_path, L"\\Parameters" ); - - /* - * Clear the table. This clears all the query callback pointers, - * and sets up the terminating table entry. - */ - cl_memclr( table, sizeof(table) ); - - // Setup the table entries. - table[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - table[0].Name = L"DebugFlags"; - table[0].EntryContext = &g_al_dbg_lvl; - table[0].DefaultType = REG_DWORD; - table[0].DefaultData = &g_al_dbg_lvl; - table[0].DefaultLength = sizeof(ULONG); - - table[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - table[1].Name = L"SmiPollInterval"; - table[1].EntryContext = &g_smi_poll_interval; - table[1].DefaultType = REG_DWORD; - table[1].DefaultData = &g_smi_poll_interval; - table[1].DefaultLength = sizeof(ULONG); - - table[2].Flags = RTL_QUERY_REGISTRY_DIRECT; - table[2].Name = L"IocQueryTimeout"; - table[2].EntryContext = &g_ioc_query_timeout; - table[2].DefaultType = REG_DWORD; - table[2].DefaultData = &g_ioc_query_timeout; - table[2].DefaultLength = sizeof(ULONG); - - table[3].Flags = RTL_QUERY_REGISTRY_DIRECT; - table[3].Name = L"IocQueryRetries"; - table[3].EntryContext = &g_ioc_query_retries; - table[3].DefaultType = REG_DWORD; - table[3].DefaultData = &g_ioc_query_retries; - table[3].DefaultLength = sizeof(ULONG); - - table[4].Flags = RTL_QUERY_REGISTRY_DIRECT; - table[4].Name = L"IocPollInterval"; - table[4].EntryContext = &g_ioc_poll_interval; - table[4].DefaultType = REG_DWORD; - table[4].DefaultData = &g_ioc_poll_interval; - table[4].DefaultLength = sizeof(ULONG); - - /* Have at it! */ - status = RtlQueryRegistryValues( RTL_REGISTRY_ABSOLUTE, - param_path.Buffer, table, NULL, NULL ); - - cl_free( param_path.Buffer ); - AL_EXIT( AL_DBG_DEV ); - return status; -} - - -NTSTATUS -DriverEntry( - IN DRIVER_OBJECT *p_driver_obj, - IN UNICODE_STRING *p_registry_path ) -{ - /* For an export driver, DriverEntry is never called. */ - UNUSED_PARAM( p_driver_obj ); - UNUSED_PARAM( p_registry_path ); - - return STATUS_SUCCESS; -} - - -NTSTATUS -DllInitialize( - IN UNICODE_STRING *p_registry_path ) -{ - NTSTATUS status; - - AL_ENTER( AL_DBG_DEV ); - - status = CL_INIT; - if( !NT_SUCCESS(status) ) - { - AL_TRACE_EXIT( AL_DBG_ERROR, - ("cl_init returned %08X.\n", status) ); - return status; - } - - /* Get the registry values. */ - status = __read_registry( p_registry_path ); - if( !NT_SUCCESS(status) ) - { - CL_DEINIT; - AL_TRACE_EXIT( AL_DBG_ERROR, - ("__read_registry returned %08x.\n", status) ); - return status; - } - - AL_EXIT( AL_DBG_DEV ); - return STATUS_SUCCESS; -} - - -NTSTATUS -DllUnload( void ) -{ - AL_ENTER( AL_DBG_DEV ); - - CL_DEINIT; - - AL_EXIT( AL_DBG_DEV ); - return STATUS_SUCCESS; -} diff --git a/trunk/core/bus/kernel/bus_driver.c b/trunk/core/bus/kernel/bus_driver.c index 09c17139..1416c16a 100644 --- a/trunk/core/bus/kernel/bus_driver.c +++ b/trunk/core/bus/kernel/bus_driver.c @@ -39,9 +39,15 @@ #include "bus_pnp.h" #include "al_mgr.h" #include "al_dev.h" +#include "al_debug.h" #include +#define DEFAULT_NODE_DESC "OpenIB Windows® Host" + + +char node_desc[IB_NODE_DESCRIPTION_SIZE]; + bus_globals_t bus_globals = { BUS_DBG_ERROR, TRUE, @@ -49,6 +55,8 @@ bus_globals_t bus_globals = { NULL }; +static void +__read_machine_name( void ); static NTSTATUS __read_registry( @@ -98,8 +106,10 @@ DriverEntry( IN DRIVER_OBJECT *p_driver_obj, IN UNICODE_STRING *p_registry_path ); + #ifdef ALLOC_PRAGMA #pragma alloc_text (INIT, DriverEntry) +#pragma alloc_text (INIT, __read_machine_name) #pragma alloc_text (INIT, __read_registry) #pragma alloc_text (PAGE, bus_drv_unload) #pragma alloc_text (PAGE, bus_drv_open) @@ -108,17 +118,75 @@ DriverEntry( #pragma alloc_text (PAGE_PNP, bus_drv_sysctl) #endif + +static void +__read_machine_name( void ) +{ + NTSTATUS status; + /* Remember the terminating entry in the table below. */ + RTL_QUERY_REGISTRY_TABLE table[2]; + UNICODE_STRING hostNamePath; + UNICODE_STRING hostNameW; + ANSI_STRING hostName; + + AL_ENTER( AL_DBG_DEV ); + + /* Get the host name. */ + RtlInitUnicodeString( &hostNamePath, L"ComputerName\\ComputerName" ); + RtlInitUnicodeString( &hostNameW, NULL ); + + /* + * Clear the table. This clears all the query callback pointers, + * and sets up the terminating table entry. + */ + cl_memclr( table, sizeof(table) ); + cl_memclr( node_desc, sizeof(node_desc) ); + + /* Setup the table entries. */ + table[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + table[0].Name = L"ComputerName"; + table[0].EntryContext = &hostNameW; + table[0].DefaultType = REG_SZ; + table[0].DefaultData = &hostNameW; + table[0].DefaultLength = 0; + + /* Have at it! */ + status = RtlQueryRegistryValues( RTL_REGISTRY_CONTROL, + hostNamePath.Buffer, table, NULL, NULL ); + if( NT_SUCCESS( status ) ) + { + /* Convert the UNICODE host name to UTF-8 (ASCII). */ + hostName.Length = 0; + hostName.MaximumLength = sizeof(node_desc); + hostName.Buffer = node_desc; + status = RtlUnicodeStringToAnsiString( &hostName, &hostNameW, FALSE ); + RtlFreeUnicodeString( &hostNameW ); + } + else + { + AL_TRACE( AL_DBG_ERROR, ("Failed to get host name.\n") ); + /* Use the default name... */ + RtlStringCbCopyNA( node_desc, sizeof(node_desc), + DEFAULT_NODE_DESC, sizeof(DEFAULT_NODE_DESC) ); + } + + AL_EXIT( AL_DBG_DEV ); +} + + static NTSTATUS __read_registry( IN UNICODE_STRING* const p_registry_path ) { NTSTATUS status; /* Remember the terminating entry in the table below. */ - RTL_QUERY_REGISTRY_TABLE table[3]; + RTL_QUERY_REGISTRY_TABLE table[8]; UNICODE_STRING param_path; BUS_ENTER( BUS_DBG_DRV ); + __read_machine_name(); + RtlInitUnicodeString( ¶m_path, NULL ); param_path.MaximumLength = p_registry_path->Length + sizeof(L"\\Parameters"); @@ -154,6 +222,41 @@ __read_registry( table[1].DefaultData = &bus_globals.dbg_lvl; table[1].DefaultLength = sizeof(ULONG); + table[2].Flags = RTL_QUERY_REGISTRY_DIRECT; + table[2].Name = L"IbalDebugFlags"; + table[2].EntryContext = &g_al_dbg_lvl; + table[2].DefaultType = REG_DWORD; + table[2].DefaultData = &g_al_dbg_lvl; + table[2].DefaultLength = sizeof(ULONG); + + table[3].Flags = RTL_QUERY_REGISTRY_DIRECT; + table[3].Name = L"SmiPollInterval"; + table[3].EntryContext = &g_smi_poll_interval; + table[3].DefaultType = REG_DWORD; + table[3].DefaultData = &g_smi_poll_interval; + table[3].DefaultLength = sizeof(ULONG); + + table[4].Flags = RTL_QUERY_REGISTRY_DIRECT; + table[4].Name = L"IocQueryTimeout"; + table[4].EntryContext = &g_ioc_query_timeout; + table[4].DefaultType = REG_DWORD; + table[4].DefaultData = &g_ioc_query_timeout; + table[4].DefaultLength = sizeof(ULONG); + + table[5].Flags = RTL_QUERY_REGISTRY_DIRECT; + table[5].Name = L"IocQueryRetries"; + table[5].EntryContext = &g_ioc_query_retries; + table[5].DefaultType = REG_DWORD; + table[5].DefaultData = &g_ioc_query_retries; + table[5].DefaultLength = sizeof(ULONG); + + table[6].Flags = RTL_QUERY_REGISTRY_DIRECT; + table[6].Name = L"IocPollInterval"; + table[6].EntryContext = &g_ioc_poll_interval; + table[6].DefaultType = REG_DWORD; + table[6].DefaultData = &g_ioc_poll_interval; + table[6].DefaultLength = sizeof(ULONG); + /* Have at it! */ status = RtlQueryRegistryValues( RTL_REGISTRY_ABSOLUTE, param_path.Buffer, table, NULL, NULL ); diff --git a/trunk/core/bus/kernel/ib_bus.inf b/trunk/core/bus/kernel/ib_bus.inf index 9b05bbe3..8055b1da 100644 --- a/trunk/core/bus/kernel/ib_bus.inf +++ b/trunk/core/bus/kernel/ib_bus.inf @@ -6,7 +6,7 @@ Signature="$Windows NT$" Class=System ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318} Provider=%OPENIB% -DriverVer=01/12/2006,1.0.0000.213 +DriverVer=03/31/2006,1.0.0000.267 ; ================= Device Install section ===================== @@ -27,83 +27,71 @@ Ibbus.WOW64CopyFiles=%DIRID_SYSTEM_X86% 1=%DiskId%,,,\ia64 [SourceDisksFiles.x86] -ibal.sys=1 ibbus.sys=1 ibiou.sys=1 ibal.dll=1 complib.dll=1 ibald.dll=1 complibd.dll=1 -datd.dll=1 -dat.dll=1 -dapld.dll=1 -dapl.dll=1 [SourceDisksFiles.amd64] -ibal.sys=1 ibbus.sys=1 ibiou.sys=1 ibal.dll=1 complib.dll=1 ibald.dll=1 complibd.dll=1 -datd.dll=1 -dat.dll=1 -dapld.dll=1 -dapl.dll=1 cl32d.dll=1 cl32.dll=1 ibal32d.dll=1 ibal32.dll=1 -dat32d.dll=1 -dat32.dll=1 -dapl32d.dll=1 -dapl32.dll=1 [SourceDisksFiles.ia64] -ibal.sys=1 ibbus.sys=1 ibiou.sys=1 ibal.dll=1 complib.dll=1 ibald.dll=1 complibd.dll=1 -datd.dll=1 -dat.dll=1 -dapld.dll=1 -dapl.dll=1 cl32d.dll=1 cl32.dll=1 ibal32d.dll=1 ibal32.dll=1 -dat32d.dll=1 -dat32.dll=1 -dapl32d.dll=1 -dapl32.dll=1 [Manufacturer] %OPENIB% = Ibbus.DeviceSection,ntx86,ntamd64,ntia64 +%SST% = SST.DeviceSection,ntx86,ntamd64,ntia64 [Ibbus.DeviceSection] ; empty since we don't support W9x/Me +[Ibbus.DeviceSection.nt] +%Iou.DeviceDesc% = Iou.DDInstall,IBA\IB_IOU + [Ibbus.DeviceSection.ntx86] %Ibbus.DeviceDesc% = Ibbus.DDInstall,{94f41ced-78eb-407c-b5df-958040af0fd8} -%VFx.DeviceDesc% = VFx.DDInstall,IBA\V00066aP0010v000000a1,IBA\V00066aP0010 -%VEx.DeviceDesc% = VEx.DDInstall,IBA\V00066aP0008v000000a1,IBA\V00066aP0008 -%Iou.DeviceDesc% = Iou.DDInstall,IBA\IB_IOU [Ibbus.DeviceSection.ntamd64] %Ibbus.DeviceDesc% = Ibbus.DDInstall,{94f41ced-78eb-407c-b5df-958040af0fd8} -%VFx.DeviceDesc% = VFx.DDInstall,IBA\V00066aP0010v000000a1,IBA\V00066aP0010 -%VEx.DeviceDesc% = VEx.DDInstall,IBA\V00066aP0008v000000a1,IBA\V00066aP0008 -%Iou.DeviceDesc% = Iou.DDInstall,IBA\IB_IOU [Ibbus.DeviceSection.ntia64] %Ibbus.DeviceDesc% = Ibbus.DDInstall,{94f41ced-78eb-407c-b5df-958040af0fd8} -%VFx.DeviceDesc% = VFx.DDInstall,IBA\V00066aP0010v000000a1,IBA\V00066aP0010 -%VEx.DeviceDesc% = VEx.DDInstall,IBA\V00066aP0008v000000a1,IBA\V00066aP0008 -%Iou.DeviceDesc% = Iou.DDInstall,IBA\IB_IOU + +[SST.DeviceSection] +; empty since we don't support W9x/Me + +[SST.DeviceSection.ntx86] +%VFx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0010v000000a1,IBA\V00066aP0010 +%VEx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0008v000000a1,IBA\V00066aP0008 + +[SST.DeviceSection.ntamd64] +%VFx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0010v000000a1,IBA\V00066aP0010 +%VEx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0008v000000a1,IBA\V00066aP0008 + +[SST.DeviceSection.ntia64] +%VFx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0010v000000a1,IBA\V00066aP0010 +%VEx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0008v000000a1,IBA\V00066aP0008 + [Ibbus.DDInstall.ntx86] CopyFiles = Ibbus.CopyFiles @@ -121,27 +109,12 @@ CopyFiles = Ibbus.WOW64CopyFiles [Ibbus.DDInstall.ntx86.Services] AddService = ibbus,%SPSVCINST_ASSOCSERVICE%,Ibbus.ServiceInstall -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall [Ibbus.DDInstall.ntamd64.Services] AddService = ibbus,%SPSVCINST_ASSOCSERVICE%,Ibbus.ServiceInstall -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall [Ibbus.DDInstall.ntia64.Services] AddService = ibbus,%SPSVCINST_ASSOCSERVICE%,Ibbus.ServiceInstall -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall - -[VFx.DDInstall.nt] -CopyFiles = Iou.CopyFiles - -[VFx.DDInstall.nt.Services] -AddService = ibiou,%SPSVCINST_ASSOCSERVICE%,Iou.ServiceInstall - -[VEx.DDInstall.nt] -CopyFiles = Iou.CopyFiles - -[VEx.DDInstall.nt.Services] -AddService = ibiou,%SPSVCINST_ASSOCSERVICE%,Iou.ServiceInstall [Iou.DDInstall.nt] CopyFiles = Iou.CopyFiles @@ -150,28 +123,19 @@ CopyFiles = Iou.CopyFiles AddService = ibiou,%SPSVCINST_ASSOCSERVICE%,Iou.ServiceInstall [Ibbus.CopyFiles] -ibal.sys ibbus.sys [Ibbus.UMCopyFiles] complib.dll,,,2 ibal.dll,,,2 -dat.dll,,,2 -dapl.dll,,,2 complibd.dll,,,2 ibald.dll,,,2 -datd.dll,,,2 -dapld.dll,,,2 [Ibbus.WOW64CopyFiles] complib.dll,cl32.dll,,2 ibal.dll,ibal32.dll,,2 -dat.dll,dat32.dll,,2 -dapl.dll,dapl32.dll,,2 complibd.dll,cl32d.dll,,2 ibald.dll,ibal32d.dll,,2 -datd.dll,dat32d.dll,,2 -dapld.dll,dapl32d.dll,,2 [Iou.CopyFiles] ibiou.sys @@ -189,14 +153,6 @@ ServiceBinary = %12%\ibbus.sys LoadOrderGroup = extended base AddReg = Ibbus.ParamsReg -[Ibal.ServiceInstall] -DisplayName = %Ibal.ServiceDesc% -ServiceType = %SERVICE_KERNEL_DRIVER% -StartType = %SERVICE_DEMAND_START% -ErrorControl = %SERVICE_ERROR_NORMAL% -ServiceBinary = %12%\ibal.sys -AddReg = Ibal.ParamsReg - [Iou.ServiceInstall] DisplayName = %Iou.ServiceDesc% ServiceType = %SERVICE_KERNEL_DRIVER% @@ -208,9 +164,7 @@ AddReg = Iou.ParamsReg [Ibbus.ParamsReg] HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000 HKR,"Parameters","ReportPortNIC",%REG_DWORD%,1 - -[Ibal.ParamsReg] -HKR,"Parameters","DebugFlags",%REG_DWORD_NO_CLOBBER%,0x80000000 +HKR,"Parameters","IbalDebugFlags",%REG_DWORD%,0x80000000 HKR,"Parameters","SmiPollInterval",%REG_DWORD_NO_CLOBBER%,20000 HKR,"Parameters","IocQueryTimeout",%REG_DWORD_NO_CLOBBER%,250 HKR,"Parameters","IocQueryRetries",%REG_DWORD_NO_CLOBBER%,4 @@ -221,6 +175,7 @@ HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000 [Strings] OPENIB = "OpenIB Alliance" +SST = "SilverStorm Technologies" Ibbus.DeviceDesc = "InfiniBand Fabric" VFx.DeviceDesc = "SilverStorm VFx" VEx.DeviceDesc = "SilverStorm VEx" diff --git a/trunk/hw/mt23108/kernel/infinihost.inf b/trunk/hw/mt23108/kernel/infinihost.inf index 13552eba..a74392de 100644 --- a/trunk/hw/mt23108/kernel/infinihost.inf +++ b/trunk/hw/mt23108/kernel/infinihost.inf @@ -1,4 +1,4 @@ -; OpenIB InfiniBand HCAs. +; Mellanox Technologies InfiniBand HCAs. ; Copyright 2005 SilverStorm Technologies all Rights Reserved. [Version] @@ -6,7 +6,7 @@ Signature="$Windows NT$" Class=InfiniBandHca ClassGUID=%HcaClassGuid% Provider=%OPENIB% -DriverVer=01/12/2006,1.0.0000.213 +DriverVer=03/31/2006,1.0.0000.267 ; ================= Destination directory section ===================== @@ -44,7 +44,6 @@ HKLM,"System\CurrentControlSet\Control\CoDeviceInstallers", \ [SourceDisksFiles] IbInstaller.dll=1 -ibal.sys=1 mt23108.sys=1 thca.sys=1 mt23108u.dll=1 @@ -52,13 +51,12 @@ mt23108ud.dll=1 [SourceDisksFiles.amd64] IbInstaller.dll=1 -ibal.sys=1 mt23108.sys=1 thca.sys=1 mt23108u.dll=1 mt23108ud.dll=1 -;uvpd32.dll=1 -;uvpd32d.dll=1 +mtuvp32.dll=1 +mtuvp32d.dll=1 [SourceDisksFiles.ia64] IbInstaller.dll=1 @@ -67,11 +65,11 @@ mt23108.sys=1 thca.sys=1 mt23108u.dll=1 mt23108ud.dll=1 -;uvpd32.dll=1 -;uvpd32d.dll=1 +mtuvp32.dll=1 +mtuvp32d.dll=1 [Manufacturer] -%OPENIB% = HCA.DeviceSection,ntx86,ntamd64,ntia64 +%MTL% = HCA.DeviceSection,ntx86,ntamd64,ntia64 [HCA.DeviceSection] ; empty since we don't support W9x/Me @@ -114,20 +112,16 @@ AddReg = MT23108.FiltersReg [MT23108.DDInstall.ntx86.Services] AddService = thca,%SPSVCINST_NULL%,THCA.ServiceInstall AddService = mt23108,%SPSVCINST_ASSOCSERVICE%,MT23108.ServiceInstall -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall [MT23108.DDInstall.ntamd64.Services] AddService = thca,%SPSVCINST_NULL%,THCA.ServiceInstall AddService = mt23108,%SPSVCINST_ASSOCSERVICE%,MT23108.ServiceInstall -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall [MT23108.DDInstall.ntia64.Services] AddService = thca,%SPSVCINST_NULL%,THCA.ServiceInstall AddService = mt23108,%SPSVCINST_ASSOCSERVICE%,MT23108.ServiceInstall -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall [MT23108.CopyFiles] -ibal.sys mt23108.sys thca.sys @@ -136,8 +130,8 @@ mt23108u.dll,,,2 mt23108ud.dll,,,2 [MT23108.WOW64CopyFiles] -;mt23108u.dll,uvpd32.dll,,2 -;mt23108ud.dll,uvpd32d.dll,,2 +mt23108u.dll,mtuvp32.dll,,2 +mt23108ud.dll,mtuvp32d.dll,,2 ; ; ============= Service Install section ============== @@ -161,14 +155,6 @@ ServiceBinary = %12%\thca.sys LoadOrderGroup = extended base AddReg = THCA.ParamsReg -[Ibal.ServiceInstall] -DisplayName = %Ibal.ServiceDesc% -ServiceType = %SERVICE_KERNEL_DRIVER% -StartType = %SERVICE_DEMAND_START% -ErrorControl = %SERVICE_ERROR_NORMAL% -ServiceBinary = %12%\ibal.sys -AddReg = Ibal.ParamsReg - [MT23108.FiltersReg] HKR,,"UpperFilters", 0x00010000,"thca" @@ -183,22 +169,14 @@ HKR,"Parameters","ResetCard",%REG_DWORD%,0 [THCA.ParamsReg] HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000 -[Ibal.ParamsReg] -HKR,"Parameters","DebugFlags",%REG_DWORD_NO_CLOBBER%,0x80000000 -HKR,"Parameters","SmiPollInterval",%REG_DWORD_NO_CLOBBER%,20000 -HKR,"Parameters","IocQueryTimeout",%REG_DWORD_NO_CLOBBER%,250 -HKR,"Parameters","IocQueryRetries",%REG_DWORD_NO_CLOBBER%,4 -HKR,"Parameters","IocPollInterval",%REG_DWORD_NO_CLOBBER%,30000 - [Strings] HcaClassGuid = "{58517E00-D3CF-40c9-A679-CEE5752F4491}" OPENIB = "OpenIB Alliance" -MT23108.DeviceDesc = "Mellanox MT23108 InfiniBand HCA" +MTL = "Mellanox Technologies Ltd." MT23108.ServiceDesc = "Mellanox MT23108 InfiniBand HCA Driver" -MT25208.DeviceDesc = "Mellanox MT25208 InfiniBand HCA" -MT25208.ServiceDesc = "Mellanox MT25208 InfiniBand HCA Driver" +MT23108.DeviceDesc = "InfiniHost (MT23108) - Mellanox InfiniBand HCA" +MT25208.DeviceDesc = "InfiniHost (MT25208) - Mellanox InfiniBand HCA for PCI Express" THCA.ServiceDesc = "Mellanox HCA VPD for IBAL" -Ibal.ServiceDesc = "OpenIB InfiniBand Access Layer" DiskId = "OpenIB InfiniBand HCA installation disk" SPSVCINST_NULL = 0x0 SPSVCINST_ASSOCSERVICE = 0x00000002 @@ -206,7 +184,6 @@ SERVICE_KERNEL_DRIVER = 1 SERVICE_DEMAND_START = 3 SERVICE_ERROR_NORMAL = 1 REG_DWORD = 0x00010001 -REG_DWORD_NO_CLOBBER = 0x00010003 REG_MULTI_SZ_APPEND = 0x00010008 DIRID_SYSTEM = 11 DIRID_DRIVERS = 12 diff --git a/trunk/hw/mthca/kernel/mthca.inf b/trunk/hw/mthca/kernel/mthca.inf index 5a58a258..1cceff0d 100644 --- a/trunk/hw/mthca/kernel/mthca.inf +++ b/trunk/hw/mthca/kernel/mthca.inf @@ -46,14 +46,12 @@ HKLM,"System\CurrentControlSet\Control\CoDeviceInstallers", \ [SourceDisksFiles] IbInstaller.dll=1 -ibal.sys=1 mthca.sys=1 mthcau.dll=1 mthcaud.dll=1 [SourceDisksFiles.amd64] IbInstaller.dll=1 -ibal.sys=1 mthca.sys=1 mthcau.dll=1 mthcaud.dll=1 @@ -62,7 +60,6 @@ mthcaud.dll=1 [SourceDisksFiles.ia64] IbInstaller.dll=1 -ibal.sys=1 mthca.sys=1 mthcau.dll=1 mthcaud.dll=1 @@ -113,18 +110,14 @@ CopyFiles = MTHCA.WOW64CopyFiles [MTHCA.DDInstall.ntx86.Services] AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall [MTHCA.DDInstall.ntamd64.Services] AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall [MTHCA.DDInstall.ntia64.Services] AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog -AddService = ibal,%SPSVCINST_NULL%,Ibal.ServiceInstall [MTHCA.CopyFiles] -ibal.sys mthca.sys [MTHCA.UMCopyFiles] @@ -149,14 +142,6 @@ ServiceBinary = %12%\mthca.sys LoadOrderGroup = extended base AddReg = MTHCA.ParamsReg -[Ibal.ServiceInstall] -DisplayName = %Ibal.ServiceDesc% -ServiceType = %SERVICE_KERNEL_DRIVER% -StartType = %SERVICE_DEMAND_START% -ErrorControl = %SERVICE_ERROR_NORMAL% -ServiceBinary = %12%\ibal.sys -AddReg = Ibal.ParamsReg - [MTHCA.EventLog] AddReg = MTHCA.AddEventLogReg @@ -171,17 +156,9 @@ HKR,"Parameters","DebugFlags",%REG_DWORD%,0x0000ffff HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\8bf1f640-63fe-4743-b9ef-fa38c695bfde","Flags",%REG_DWORD%,0xffff HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\8bf1f640-63fe-4743-b9ef-fa38c695bfde","Level",%REG_DWORD%,0x3 -[Ibal.ParamsReg] -HKR,"Parameters","DebugFlags",%REG_DWORD_NO_CLOBBER%,0x80000000 -HKR,"Parameters","SmiPollInterval",%REG_DWORD_NO_CLOBBER%,20000 -HKR,"Parameters","IocQueryTimeout",%REG_DWORD_NO_CLOBBER%,250 -HKR,"Parameters","IocQueryRetries",%REG_DWORD_NO_CLOBBER%,4 -HKR,"Parameters","IocPollInterval",%REG_DWORD_NO_CLOBBER%,30000 - [Strings] HcaClassGuid = "{58517E00-D3CF-40c9-A679-CEE5752F4491}" MTL="Mellanox Technologies Ltd." -Ibal.ServiceDesc = "Mellanox InfiniBand Access Layer" MTHCA.ServiceDesc = "Driver for Mellanox InfiniHost Devices" MT23108.DeviceDesc="InfiniHost (MT23108) - Mellanox InfiniBand HCA" MT25208.DeviceDesc="InfiniHost (MT25208) - Mellanox InfiniBand HCA for PCI Express" @@ -195,7 +172,6 @@ SERVICE_KERNEL_DRIVER = 1 SERVICE_DEMAND_START = 3 SERVICE_ERROR_NORMAL = 1 REG_DWORD = 0x00010001 -REG_DWORD_NO_CLOBBER = 0x00010003 REG_MULTI_SZ_APPEND = 0x00010008 DIRID_SYSTEM = 11 DIRID_DRIVERS = 12 diff --git a/trunk/inc/iba/ib_types.h b/trunk/inc/iba/ib_types.h index 461010ff..1c477292 100644 --- a/trunk/inc/iba/ib_types.h +++ b/trunk/inc/iba/ib_types.h @@ -37,19 +37,19 @@ #include #include +#ifdef CL_KERNEL + #define AL_EXPORT + #define AL_API + #define AL_INLINE static inline +#else #if defined( EXPORT_AL_SYMBOLS ) #define AL_EXPORT __declspec(dllexport) #else #define AL_EXPORT __declspec(dllimport) #endif - - #ifdef CL_KERNEL - #define AL_API - #define AL_INLINE static inline - #else - #define AL_API __stdcall - #define AL_INLINE AL_EXPORT inline - #endif /* CL_KERNEL */ + #define AL_API __stdcall + #define AL_INLINE AL_EXPORT inline +#endif /* CL_KERNEL */ #ifdef __cplusplus diff --git a/trunk/tests/alts/dirs b/trunk/tests/alts/dirs index ddf0ed7d..d1917e8a 100644 --- a/trunk/tests/alts/dirs +++ b/trunk/tests/alts/dirs @@ -1,3 +1,3 @@ DIRS=\ user \ - kernel +# kernel -- 2.41.0