Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-09 03:37:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SCSIPORT] Fix the hardware IDs and remove the superfluous one

Browse source
This commit is contained in:
Eric Kohl 2020-12-10 23:25:06 +01:00
parent 5099f24373
commit 8ba87f972d
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/storage/port/scsiport/pdo.c
View file

@ -354,8 +354,8 @@ PdoHandleQueryHardwareId(
PSCSI_PORT_LUN_EXTENSION PDODeviceExtension = DeviceObject->DeviceExtension; PSCSI_PORT_LUN_EXTENSION PDODeviceExtension = DeviceObject->DeviceExtension;
LPCSTR GenericType, DeviceType; LPCSTR GenericType, DeviceType;
LPWSTR Buffer; LPWSTR Buffer;
CHAR Id1[50], Id2[50], Id3[50], Id4[50], Id5[50], Id6[50], Id7[50]; CHAR Id1[50], Id2[50], Id3[50], Id4[50], Id5[50], Id6[50];
ULONG Id1Length, Id2Length, Id3Length, Id4Length, Id5Length, Id6Length, Id7Length; ULONG Id1Length, Id2Length, Id3Length, Id4Length, Id5Length, Id6Length;
ULONG Offset, TotalLength, Length; ULONG Offset, TotalLength, Length;
PINQUIRYDATA InquiryData; PINQUIRYDATA InquiryData;
@ -400,11 +400,10 @@ PdoHandleQueryHardwareId(
DPRINT("PdoHandleQueryHardwareId HardwareId3 %s\n", Id3); DPRINT("PdoHandleQueryHardwareId HardwareId3 %s\n", Id3);
// generate id 4 // generate id 4
// SCSI\SCSIType_VendorId(8)_ProductId(16)_Revision(1) // SCSI\VendorId(8)_ProductId(16)_Revision(1)
RtlZeroMemory(Id4, sizeof(Id4)); RtlZeroMemory(Id4, sizeof(Id4));
Offset = 0; Offset = 0;
Offset = sprintf(&Id4[Offset], "SCSI\\"); Offset = sprintf(&Id4[Offset], "SCSI\\");
Offset += sprintf(&Id4[Offset], DeviceType);
Offset += CopyField(InquiryData->VendorId, &Id4[Offset], 8); Offset += CopyField(InquiryData->VendorId, &Id4[Offset], 8);
Offset += CopyField(InquiryData->ProductId, &Id4[Offset], 16); Offset += CopyField(InquiryData->ProductId, &Id4[Offset], 16);
Offset += CopyField(InquiryData->ProductRevisionLevel, &Id4[Offset], 1); Offset += CopyField(InquiryData->ProductRevisionLevel, &Id4[Offset], 1);
@ -412,34 +411,24 @@ PdoHandleQueryHardwareId(
DPRINT("PdoHandleQueryHardwareId HardwareId4 %s\n", Id4); DPRINT("PdoHandleQueryHardwareId HardwareId4 %s\n", Id4);
// generate id 5 // generate id 5
// SCSIType_VendorId(8)_ProductId(16)_Revision(1) // VendorId(8)_ProductId(16)_Revision(1)
RtlZeroMemory(Id5, sizeof(Id5)); RtlZeroMemory(Id5, sizeof(Id5));
Offset = 0; Offset = 0;
Offset = sprintf(&Id5[Offset], DeviceType); Offset = CopyField(InquiryData->VendorId, &Id5[Offset], 8);
Offset += CopyField(InquiryData->VendorId, &Id5[Offset], 8);
Offset += CopyField(InquiryData->ProductId, &Id5[Offset], 16); Offset += CopyField(InquiryData->ProductId, &Id5[Offset], 16);
Offset += CopyField(InquiryData->ProductRevisionLevel, &Id5[Offset], 1); Offset += CopyField(InquiryData->ProductRevisionLevel, &Id5[Offset], 1);
Id5Length = strlen(Id5) + 1; Id5Length = strlen(Id5) + 1;
DPRINT("PdoHandleQueryHardwareId HardwareId5 %s\n", Id5); DPRINT("PdoHandleQueryHardwareId HardwareId5 %s\n", Id5);
// generate id 6 // generate id 6
// SCSI\SCSIType // SCSIType
RtlZeroMemory(Id6, sizeof(Id6)); RtlZeroMemory(Id6, sizeof(Id6));
Offset = 0; Offset = 0;
Offset = sprintf(&Id6[Offset], "SCSI\\"); Offset = sprintf(&Id6[Offset], GenericType);
Offset += sprintf(&Id6[Offset], GenericType);
Id6Length = strlen(Id6) + 1; Id6Length = strlen(Id6) + 1;
DPRINT("PdoHandleQueryHardwareId HardwareId6 %s\n", Id6); DPRINT("PdoHandleQueryHardwareId HardwareId6 %s\n", Id6);
// generate id 7 TotalLength = Id1Length + Id2Length + Id3Length + Id4Length + Id5Length + Id6Length + 1;
// SCSIType
RtlZeroMemory(Id7, sizeof(Id7));
Offset = 0;
Offset = sprintf(&Id7[Offset], GenericType);
Id7Length = strlen(Id7) + 1;
DPRINT("PdoHandleQueryHardwareId HardwareId7 %s\n", Id7);
TotalLength = Id1Length + Id2Length + Id3Length + Id4Length + Id5Length + Id6Length + Id7Length + 1;
Buffer = ExAllocatePoolWithTag(PagedPool, TotalLength * sizeof(WCHAR), TAG_SCSIPORT); Buffer = ExAllocatePoolWithTag(PagedPool, TotalLength * sizeof(WCHAR), TAG_SCSIPORT);
if (!Buffer) if (!Buffer)
@ -458,7 +447,6 @@ PdoHandleQueryHardwareId(
ConvertToUnicodeString(Id4, Length, Offset, Buffer, &Offset); ConvertToUnicodeString(Id4, Length, Offset, Buffer, &Offset);
ConvertToUnicodeString(Id5, Length, Offset, Buffer, &Offset); ConvertToUnicodeString(Id5, Length, Offset, Buffer, &Offset);
ConvertToUnicodeString(Id6, Length, Offset, Buffer, &Offset); ConvertToUnicodeString(Id6, Length, Offset, Buffer, &Offset);
ConvertToUnicodeString(Id7, Length, Offset, Buffer, &Offset);
Buffer[Offset] = UNICODE_NULL; Buffer[Offset] = UNICODE_NULL;