From 01c1e3aa2e7fc930ef197162d326fbe3816143b2 Mon Sep 17 00:00:00 2001
From: Jozef Nagy <schkwve@gmail.com>
Date: Sun, 21 Jan 2024 18:46:13 +0100
Subject: [PATCH] Added global GUID variables

---
 efi.h  |  8 --------
 guid.h | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/efi.h b/efi.h
index 4e1c543..56ce08c 100644
--- a/efi.h
+++ b/efi.h
@@ -164,14 +164,6 @@ typedef struct EFI_BOOT_SERVICES EFI_BOOT_SERVICES;
 // EFI System Table
 typedef struct EFI_SYSTEM_TABLE EFI_SYSTEM_TABLE;
 
-// EFI GUID
-typedef struct EFI_GUID {
-	UINT32 Data1;
-	UINT16 Data2;
-	UINT16 Data3;
-	UINT8 Data4[8];
-} EFI_GUID;
-
 // EFI Certificate RSA2048 SHA256 Block
 typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {
 	EFI_GUID HashType;
diff --git a/guid.h b/guid.h
index e3400f2..df34e52 100644
--- a/guid.h
+++ b/guid.h
@@ -1,6 +1,16 @@
 #ifndef GUID_H
 #define GUID_H
 
+#include "efi_types.h"
+
+// EFI GUID Definition
+typedef struct EFI_GUID {
+	UINT32 Data1;
+	UINT16 Data2;
+	UINT16 Data3;
+	UINT8 Data4[8];
+} EFI_GUID;
+
 // Driver Signing
 #define EFI_CERT_TYPE_RSA2048_SHA256_GUID {0xa7717414,0xc616,0x4977, {0x94,0x20,0x84,0x47,0x12,0xa7,0x35,0xbf}}
 #define EFI_CERT_TYPE_PKCS7_GUID {0x4aafd29d,0x68df,0x49ee, {0x8a,0xa9,0x34,0x7d,0x37,0x56,0x65,0xa7}}
@@ -18,6 +28,28 @@
 
 // Capsules
 #define EFI_MEMORY_RANGE_CAPSULE_GUID {0xde9f0ec,0x88b6,0x428f, {0x97,0x7a,0x25,0x8f,0x1d,0xe,0x5e,0x72}}
-#define EFI_CAPSULE_REPORT_GUID {0x39b68c46,0xf7fb,0x441b, {0xb6,0xec,0x16,0xb0,0xf6,0x98,0x21,0xf3}};
+#define EFI_CAPSULE_REPORT_GUID {0x39b68c46,0xf7fb,0x441b, {0xb6,0xec,0x16,0xb0,0xf6,0x98,0x21,0xf3}}
+
+/**********************
+ *    Global GUIDs    *
+ **********************/
+// EXTERN EFI_GUID gEfiCertTypeRsa2048Sha256Guid;
+// EXTERN EFI_GUID gEfiCertTypePkcs7Guid;
+// EXTERN EFI_GUID gSimpleTextInputProtocolGuid;
+// EXTERN EFI_GUID gSimpleTextOutputProtocolGuid;
+// EXTERN EFI_GUID gEfiSimpleFileSystemProtocolGuid;
+// EXTERN EFI_GUID gEfiHiiPackageListProtocolGuid;
+// EXTERN EFI_GUID gEfiDevicePathProtocolGuid;
+// EXTERN EFI_GUID gEfiMemoryRangeCapsuleGuid;
+// EXTERN EFI_GUID gEfiCapsuleReportGuid;
+static EFI_GUID gEfiCertTypeRsa2048Sha256Guid = EFI_CERT_TYPE_RSA2048_SHA256_GUID;
+static EFI_GUID gEfiCertTypePkcs7Guid = EFI_CERT_TYPE_PKCS7_GUID;
+static EFI_GUID gSimpleTextInputProtocolGuid = EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID;
+static EFI_GUID gSimpleTextOutputProtocolGuid = EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID;
+static EFI_GUID gEfiSimpleFileSystemProtocolGuid = EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
+static EFI_GUID gEfiHiiPackageListProtocolGuid = EFI_HII_PACKAGE_LIST_PROTOCOL_GUID;
+static EFI_GUID gEfiDevicePathProtocolGuid = EFI_DEVICE_PATH_PROTOCOL_GUID;
+static EFI_GUID gEfiMemoryRangeCapsuleGuid = EFI_MEMORY_RANGE_CAPSULE_GUID;
+static EFI_GUID gEfiCapsuleReportGuid = EFI_CAPSULE_REPORT_GUID;
 
 #endif /* GUID_H */