From ea2de4d5a1b69166592bff24b6aa784d02f682bc Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Mon, 15 Aug 2022 19:24:47 +0200
Subject: [PATCH] Add missing forward reference and missing fields to the
 EFI_BLOCK_DEVICE structure

---
 sdk/xtdk/xtstruct.h | 1 +
 sdk/xtdk/xtuefi.h   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sdk/xtdk/xtstruct.h b/sdk/xtdk/xtstruct.h
index 14172cc4..0983dd87 100644
--- a/sdk/xtdk/xtstruct.h
+++ b/sdk/xtdk/xtstruct.h
@@ -17,6 +17,7 @@ typedef struct _EFI_ACPI_ADR_DEVICE_PATH EFI_ACPI_ADR_DEVICE_PATH, *PEFI_ACPI_AD
 typedef struct _EFI_ACPI_HID_DEVICE_PATH EFI_ACPI_HID_DEVICE_PATH, *PEFI_ACPI_HID_DEVICE_PATH;
 typedef struct _EFI_ATAPI_DEVICE_PATH EFI_ATAPI_DEVICE_PATH, *PEFI_ATAPI_DEVICE_PATH;
 typedef struct _EFI_BBS_BBS_DEVICE_PATH EFI_BBS_BBS_DEVICE_PATH, *PEFI_BBS_BBS_DEVICE_PATH;
+typedef struct _EFI_BLOCK_DEVICE EFI_BLOCK_DEVICE, *PEFI_BLOCK_DEVICE;
 typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL, *PEFI_BLOCK_IO_PROTOCOL;
 typedef struct _EFI_BLOCK_IO2_PROTOCOL EFI_BLOCK_IO2_PROTOCOL, *PEFI_BLOCK_IO2_PROTOCOL;
 typedef struct _EFI_BLOCK_IO2_TOKEN EFI_BLOCK_IO2_TOKEN, *PEFI_BLOCK_IO2_TOKEN;
diff --git a/sdk/xtdk/xtuefi.h b/sdk/xtdk/xtuefi.h
index 7413e92d..685aaef5 100644
--- a/sdk/xtdk/xtuefi.h
+++ b/sdk/xtdk/xtuefi.h
@@ -1442,11 +1442,12 @@ typedef struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL
 /* Describes block device */
 typedef struct _EFI_BLOCK_DEVICE
 {
-    PEFI_DEVICE_PATH_PROTOCOL DevicePath;
+    LIST_ENTRY ListEntry;
     EFI_GUID Guid;
     USHORT DriveType;
     ULONG DriveNumber;
     ULONG PartitionNumber;
+    PEFI_DEVICE_PATH_PROTOCOL DevicePath;
 } EFI_BLOCK_DEVICE, *PEFI_BLOCK_DEVICE;
 
 /* Block I/O media structure */