From 5ee633f7d7e34b513b7f4ee27e07c8e9a2ee0fca Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Fri, 13 May 2022 17:24:02 +0300 Subject: [PATCH] [BUSLOGIC] Fix reference link to VMware driver source page - Clarify driver version in 3rd Party Files. - Fix some minor formatting problems. - Also add missing OBJ_KERNEL_HANDLE to match Zw*() uses. (#4499) CORE-10207 CORE-18180 Co-authored-by: Serge Gautherie --- drivers/storage/port/buslogic/BT958.mof | 26 ++++++++++---------- drivers/storage/port/buslogic/BusLogic958.rc | 6 ++--- drivers/storage/port/buslogic/Log.c | 4 +-- drivers/storage/port/buslogic/README.ReactOS | 4 ++- media/doc/3rd Party Files.txt | 4 +-- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/drivers/storage/port/buslogic/BT958.mof b/drivers/storage/port/buslogic/BT958.mof index 3566f0e23dc..878e09e9bcb 100644 --- a/drivers/storage/port/buslogic/BT958.mof +++ b/drivers/storage/port/buslogic/BT958.mof @@ -12,19 +12,19 @@ class BT958ExtendedSetupInfoGuid [read,key] String InstanceName; [read] boolean Active; - [read, WmiDataId(1), WmiVersion(1)] uint8 BusType; - [read, WmiDataId(2), WmiVersion(1)] uint8 BIOS_Address; - [read, WmiDataId(3), WmiVersion(1)] uint16 ScatterGatherLimit; - [read, WmiDataId(4), WmiVersion(1)] uint8 MailboxCount; - [read, WmiDataId(5), WmiVersion(1)] uint32 BaseMailboxAddress; - [read, WmiDataId(6), WmiVersion(1)] boolean FastOnEISA; - [read, WmiDataId(7), WmiVersion(1)] boolean LevelSensitiveInterrupt; - [read, WmiDataId(8), WmiVersion(1), max(3)] uint8 FirmwareRevision[]; - [read, WmiDataId(9), WmiVersion(1)] boolean HostWideSCSI; - [read, WmiDataId(10), WmiVersion(1)] boolean HostDifferentialSCSI; - [read, WmiDataId(11), WmiVersion(1)] boolean HostSupportsSCAM; - [read, WmiDataId(12), WmiVersion(1)] boolean HostUltraSCSI; - [read, WmiDataId(13), WmiVersion(1)] boolean HostSmartTermination; + [read, WmiDataId(1), WmiVersion(1)] uint8 BusType; + [read, WmiDataId(2), WmiVersion(1)] uint8 BIOS_Address; + [read, WmiDataId(3), WmiVersion(1)] uint16 ScatterGatherLimit; + [read, WmiDataId(4), WmiVersion(1)] uint8 MailboxCount; + [read, WmiDataId(5), WmiVersion(1)] uint32 BaseMailboxAddress; + [read, WmiDataId(6), WmiVersion(1)] boolean FastOnEISA; + [read, WmiDataId(7), WmiVersion(1)] boolean LevelSensitiveInterrupt; + [read, WmiDataId(8), WmiVersion(1), max(3)] uint8 FirmwareRevision[]; + [read, WmiDataId(9), WmiVersion(1)] boolean HostWideSCSI; + [read, WmiDataId(10), WmiVersion(1)] boolean HostDifferentialSCSI; + [read, WmiDataId(11), WmiVersion(1)] boolean HostSupportsSCAM; + [read, WmiDataId(12), WmiVersion(1)] boolean HostUltraSCSI; + [read, WmiDataId(13), WmiVersion(1)] boolean HostSmartTermination; }; diff --git a/drivers/storage/port/buslogic/BusLogic958.rc b/drivers/storage/port/buslogic/BusLogic958.rc index 777aace2945..02a1fdddc67 100644 --- a/drivers/storage/port/buslogic/BusLogic958.rc +++ b/drivers/storage/port/buslogic/BusLogic958.rc @@ -81,18 +81,18 @@ MOFRESOURCE MOFDATA "BT958.bmf" // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" diff --git a/drivers/storage/port/buslogic/Log.c b/drivers/storage/port/buslogic/Log.c index 47f138f948c..944ee5574e4 100644 --- a/drivers/storage/port/buslogic/Log.c +++ b/drivers/storage/port/buslogic/Log.c @@ -25,7 +25,7 @@ BOOLEAN LogMessage(PCHAR szFormat, ...) fileName.Length = 0; fileName.MaximumLength = sizeof(DEFAULT_LOG_FILE_NAME) + sizeof(UNICODE_NULL); fileName.Buffer = ExAllocatePool(PagedPool, - fileName.MaximumLength); + fileName.MaximumLength); if (!fileName.Buffer) { return FALSE; @@ -37,7 +37,7 @@ BOOLEAN LogMessage(PCHAR szFormat, ...) InitializeObjectAttributes (&objectAttributes, (PUNICODE_STRING)&fileName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL ); diff --git a/drivers/storage/port/buslogic/README.ReactOS b/drivers/storage/port/buslogic/README.ReactOS index 1af58010501..952cc69174e 100644 --- a/drivers/storage/port/buslogic/README.ReactOS +++ b/drivers/storage/port/buslogic/README.ReactOS @@ -1,5 +1,7 @@ This code was published by VMware on their website at -http://www.vmware.com/download/open_sources.html. The intro there says: +https://customerconnect.vmware.com/downloads/details?productId=23&downloadGroup=SERVER-SCSI-OS + +The intro there says: This open source software is licensed under the terms of various open source license agreements included with the materials relating to the open source diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 772f9dcd072..f9c9e611729 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -147,9 +147,9 @@ URL: http://alter.org.ua/soft/win/uni_ata/ Title: Miniport driver for the Buslogic BT 958 SCSI Controller Path: drivers/storage/port/buslogic -Used Version: ??? +Used Version: v1.2.0.2 (2005-08-17) License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) -URL: http://www.vmware.com/download/open_sources.html +URL: https://customerconnect.vmware.com/downloads/details?productId=23&downloadGroup=SERVER-SCSI-OS Title: AC97 Sample Driver Path: drivers/wdm/audio/drivers/ac97