updated buslogic driver to version 1.2.0.4

See issue #1891 for more details.

svn path=/trunk/; revision=25086
This commit is contained in:
Christoph von Wittich
2006-12-08 02:01:34 +00:00
parent ae69669470
commit 6bf437add2
7 changed files with 1668 additions and 1606 deletions
+7 -7
View File
@@ -17,14 +17,14 @@ class BT958ExtendedSetupInfoGuid
[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:1;
[read, WmiDataId(7), WmiVersion(1)] boolean LevelSensitiveInterrupt:1;
[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:1;
[read, WmiDataId(10), WmiVersion(1)] boolean HostDifferentialSCSI:1;
[read, WmiDataId(11), WmiVersion(1)] boolean HostSupportsSCAM:1;
[read, WmiDataId(12), WmiVersion(1)] boolean HostUltraSCSI:1;
[read, WmiDataId(13), WmiVersion(1)] boolean HostSmartTermination:1;
[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;
};
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+19 -19
View File
@@ -21,6 +21,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#define DRIVER_VERSION 1,2,0,4
#define DRIVER_VERSION_STRING "1.2.0.4"
#define DRIVER_NAME "VMware SCSI Controller Driver"
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -28,34 +32,30 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2,0,0
PRODUCTVERSION 1,2,0,0
FILEFLAGSMASK 0x3fL
FILEVERSION DRIVER_VERSION
PRODUCTVERSION DRIVER_VERSION
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS 0x1L
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x3L
FILESUBTYPE 0x7L
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DRV
FILESUBTYPE VFT2_DRV_SYSTEM
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "VMware, Inc.\0"
VALUE "FileDescription", "VMware SCSI Controller\0"
VALUE "FileVersion", "1, 2, 0, 0\0"
VALUE "InternalName", "vmscsi.sys\0"
VALUE "LegalCopyright", "Copyright © 1998-2003 VMware, Inc.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "vmscsi.sys\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "VMware, Inc. Script1 Application\0"
VALUE "ProductVersion", "1, 2, 0, 0\0"
VALUE "SpecialBuild", "\0"
VALUE "CompanyName", "VMware, Inc." "\0"
VALUE "FileDescription", DRIVER_NAME "\0"
VALUE "FileVersion", DRIVER_VERSION_STRING "\0"
VALUE "InternalName", "vmscsi.sys" "\0"
VALUE "LegalCopyright", "Copyright © 1998-2004 VMware, Inc." "\0"
VALUE "OriginalFilename", "vmscsi.sys" "\0"
VALUE "ProductName", DRIVER_NAME "\0"
VALUE "ProductVersion", DRIVER_VERSION_STRING "\0"
END
END
BLOCK "VarFileInfo"
@@ -1,5 +1,8 @@
clean:
del BT958dt.h BT958.bmf
del $(O)\BT958dt.h $(O)\BT958.bmf
BT958dt.h: BT958.bmf
wmimofck -hBT958dt.h BT958.bmf
$(O)\BT958.bmf: BT958.mof
mofcomp -B:$(O)\BT958.bmf BT958.mof
$(O)\BT958dt.h: $(O)\BT958.bmf
wmimofck -h$(O)\BT958dt.h $(O)\BT958.bmf
+17 -8
View File
@@ -1,17 +1,26 @@
TARGETNAME=vmscsi
TARGETPATH=obj
TARGETTYPE=MINIPORT
NT_UP=0
!if ("$(DDK_TARGET_OS)" == "Win2K")
TARGETPATH=win2k
!elseif ("$(DDK_TARGET_OS)" == "WinNET")
TARGETPATH=wnet
!endif
TARGETLIBS=$(DDK_LIB_PATH)\scsiport.lib \
$(DDK_LIB_PATH)\scsiwmi.lib \
$(DDK_LIB_PATH)\scsiwmi.lib \
$(SDK_LIB_PATH)\ntoskrnl.lib
INCLUDES = $(INCLUDES) $(O)
MSC_WARNING_LEVEL=/W3 /WX
SOURCES=BT958.mof \
BusLogic958.c \
BusLogic958.rc \
wmi.c \
Log.c
LINKER_FLAGS=$(LINKER_FLAGS) -debugtype:cv,fixup
USER_C_FLAGS=-Zi $(USER_C_FLAGS)
NTTARGETFILE0=BT958dt.h
SOURCES=BusLogic958.c \
BusLogic958.rc \
wmi.c \
Log.c
NTTARGETFILE0=$(O)\BT958dt.h $(O)\BT958.bmf
+15 -15
View File
@@ -232,7 +232,7 @@ Return Value:
--*/
{
PHW_DEVICE_EXTENSION HwDeviceExtension = (PHW_DEVICE_EXTENSION)Context;
ULONG size;
ULONG size = 0;
UCHAR status;
//
@@ -391,21 +391,21 @@ Return Value:
Result = FALSE;
}
WmiExtendedSetupInfo.BusType = ExtendedSetupInformation.BusType;
WmiExtendedSetupInfo.BIOS_Address = ExtendedSetupInformation.BIOS_Address;
WmiExtendedSetupInfo.ScatterGatherLimit = ExtendedSetupInformation.ScatterGatherLimit;
WmiExtendedSetupInfo.MailboxCount = ExtendedSetupInformation.MailboxCount;
WmiExtendedSetupInfo.BaseMailboxAddress = ExtendedSetupInformation.BaseMailboxAddress;
WmiExtendedSetupInfo.FastOnEISA = ExtendedSetupInformation.Misc.FastOnEISA;
WmiExtendedSetupInfo.BusType = ExtendedSetupInformation.BusType;
WmiExtendedSetupInfo.BIOS_Address = ExtendedSetupInformation.BIOS_Address;
WmiExtendedSetupInfo.ScatterGatherLimit = ExtendedSetupInformation.ScatterGatherLimit;
WmiExtendedSetupInfo.MailboxCount = ExtendedSetupInformation.MailboxCount;
WmiExtendedSetupInfo.BaseMailboxAddress = ExtendedSetupInformation.BaseMailboxAddress;
WmiExtendedSetupInfo.FastOnEISA = ExtendedSetupInformation.Misc.FastOnEISA;
WmiExtendedSetupInfo.LevelSensitiveInterrupt = ExtendedSetupInformation.Misc.LevelSensitiveInterrupt;
WmiExtendedSetupInfo.FirmwareRevision[3] = ExtendedSetupInformation.FirmwareRevision[3];
WmiExtendedSetupInfo.FirmwareRevision[3] = ExtendedSetupInformation.FirmwareRevision[3];
WmiExtendedSetupInfo.FirmwareRevision[3] = ExtendedSetupInformation.FirmwareRevision[3];
WmiExtendedSetupInfo.HostWideSCSI = ExtendedSetupInformation.HostWideSCSI;
WmiExtendedSetupInfo.HostDifferentialSCSI= ExtendedSetupInformation.HostDifferentialSCSI;
WmiExtendedSetupInfo.HostSupportsSCAM = ExtendedSetupInformation.HostSupportsSCAM;
WmiExtendedSetupInfo.HostUltraSCSI = ExtendedSetupInformation.HostUltraSCSI;
WmiExtendedSetupInfo.HostSmartTermination= ExtendedSetupInformation.HostSmartTermination;
WmiExtendedSetupInfo.FirmwareRevision[0] = ExtendedSetupInformation.FirmwareRevision[0];
WmiExtendedSetupInfo.FirmwareRevision[1] = ExtendedSetupInformation.FirmwareRevision[1];
WmiExtendedSetupInfo.FirmwareRevision[2] = ExtendedSetupInformation.FirmwareRevision[2];
WmiExtendedSetupInfo.HostWideSCSI = ExtendedSetupInformation.HostWideSCSI;
WmiExtendedSetupInfo.HostDifferentialSCSI= ExtendedSetupInformation.HostDifferentialSCSI;
WmiExtendedSetupInfo.HostSupportsSCAM = ExtendedSetupInformation.HostSupportsSCAM;
WmiExtendedSetupInfo.HostUltraSCSI = ExtendedSetupInformation.HostUltraSCSI;
WmiExtendedSetupInfo.HostSmartTermination= ExtendedSetupInformation.HostSmartTermination;
for (; numberOfBytes; numberOfBytes--)
{