[ros-diffs] [reactos] 01/01: [DISKPART] Store full scsi address in the diskentry

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=641fdb342ef0d4717ef26…

commit 641fdb342ef0d4717ef26837b499ede893189114
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sun Mar 27 18:05:04 2022 +0200
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sun Mar 27 18:05:04 2022 +0200

    [DISKPART] Store full scsi address in the diskentry
---
 base/system/diskpart/diskpart.h | 5 +++--
 base/system/diskpart/partlist.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h
index c7a453ed241..b961e1e7f37 100644
--- a/base/system/diskpart/diskpart.h
+++ b/base/system/diskpart/diskpart.h
@@ -152,8 +152,9 @@ typedef struct _DISKENTRY
 
     ULONG DiskNumber;
     USHORT Port;
-    USHORT Bus;
-    USHORT Id;
+    USHORT PathId;
+    USHORT TargetId;
+    USHORT Lun;
 
     /* Has the partition list been modified? */
     BOOLEAN Dirty;
diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c
index 2113373ce83..6d91e385571 100644
--- a/base/system/diskpart/partlist.c
+++ b/base/system/diskpart/partlist.c
@@ -936,8 +936,9 @@ AddDiskToList(
 
     DiskEntry->DiskNumber = DiskNumber;
     DiskEntry->Port = ScsiAddress.PortNumber;
-    DiskEntry->Bus = ScsiAddress.PathId;
-    DiskEntry->Id = ScsiAddress.TargetId;
+    DiskEntry->PathId = ScsiAddress.PathId;
+    DiskEntry->TargetId = ScsiAddress.TargetId;
+    DiskEntry->Lun = ScsiAddress.Lun;
 
     GetDriverName(DiskEntry);