Resolve distinction between const and non-const GUID declaration

5 files changed, 42 insertions, 42 deletions

diff --git a/efi_memtest/memtest86+/efi/Include/Efi_Defs.c b/efi_memtest/memtest86+/efi/Include/Efi_Defs.c
index 7af6185..fa59e0c 100644
--- a/efi_memtest/memtest86+/efi/Include/Efi_Defs.c
+++ b/efi_memtest/memtest86+/efi/Include/Efi_Defs.c
@@ -6,7 +6,7 @@
 #include "Library/UefiBootServicesTableLib.h"
 #include "Library/UefiApplicationEntryPoint.h"
 
-//GLOBAL_REMOVE_IF_UNREFERENCED GUID gEfiCallerIdGuid = {0x51d8cae0, 0x272a, 0x661f, {0xa8, 0xd9, 0x84, 0x51, 0xdf, 0xf0, 0xeb, 0xd0}};
+EFI_GUID gEfiCallerIdGuid = EFI_CALLER_ID_GUID;
 
 CHAR8 *gEfiCallerBaseName = "MemtestEfi";
 
@@ -25,8 +25,9 @@ CHAR8 *gEfiCallerBaseName = "MemtestEfi";
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiEventReadyToBootGuid = { 0x7CE88FB3, 0x4BD7, 0x4679, { 0x87, 0xA8, 0xA8, 0xD8, 0xDE, 0xE5, 0x0D, 0x2B }};
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiEventLegacyBootGuid = { 0x2A571201, 0x4966, 0x47F6, { 0x8B, 0x86, 0xF3, 0x1E, 0x41, 0xF3, 0x2F, 0x10 }};
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiGlobalVariableGuid = { 0x8BE4DF61, 0x93CA, 0x11D2, { 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C }};
-EFI_GUID gEfiAcpi20TableGuid = { 0x8868E871, 0xE4F1, 0x11D3, { 0xBC, 0x22, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }};
-EFI_GUID gEfiAcpi10TableGuid = { 0xEB9D2D30, 0x2D88, 0x11D3, { 0x9A, 0x16, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }};
+EFI_GUID gEfiAcpiTableGuid = EFI_ACPI_TABLE_GUID;
+EFI_GUID gEfiAcpi20TableGuid = EFI_ACPI_20_TABLE_GUID;
+EFI_GUID gEfiAcpi10TableGuid = EFI_ACPI_10_TABLE_GUID;
 
 // Protocols
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiDevicePathProtocolGuid = { 0x09576E91, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};
@@ -35,7 +36,7 @@ EFI_GUID gEfiAcpi10TableGuid = { 0xEB9D2D30, 0x2D88, 0x11D3, { 0x9A, 0x16, 0x00,
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiSimpleTextOutProtocolGuid = { 0x387477C2, 0x69C7, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiGraphicsOutputProtocolGuid = { 0x9042A9DE, 0x23DC, 0x4A38, { 0x96, 0xFB, 0x7A, 0xDE, 0xD0, 0x80, 0x51, 0x6A }};
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiHiiFontProtocolGuid = {0xe9ca4775, 0x8657, 0x47fc, {0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x08, 0x43, 0x24}};
-const EFI_GUID gEfiSimpleFileSystemProtocolGuid = { 0x964E5B22, 0x6459, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};
+EFI_GUID gEfiSimpleFileSystemProtocolGuid = EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiUgaDrawProtocolGuid = { 0x982C298B, 0xF4FA, 0x41CB, { 0xB8, 0x38, 0x77, 0xAA, 0x68, 0x8F, 0xB8, 0x39 }};
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiComponentNameProtocolGuid = { 0x107A772C, 0xD5E1, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }};
 //GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiComponentName2ProtocolGuid = { 0x6A7A5CFF, 0xE8D9, 0x4F70, { 0xBA, 0xDA, 0x75, 0xAB, 0x30, 0x25, 0xCE, 0x14 }};
diff --git a/efi_memtest/memtest86+/efi/Include/Efi_Defs.h b/efi_memtest/memtest86+/efi/Include/Efi_Defs.h
index 7a098e6..a99287d 100644
--- a/efi_memtest/memtest86+/efi/Include/Efi_Defs.h
+++ b/efi_memtest/memtest86+/efi/Include/Efi_Defs.h
@@ -7,8 +7,6 @@ extern "C" {
 extern GUID  gEfiCallerIdGuid;
 extern CHAR8 *gEfiCallerBaseName;
 
-#define EFI_CALLER_ID_GUID \
-  {0x51d8cae0, 0x272a, 0x661f, {0xa8, 0xd9, 0x84, 0x51, 0xdf, 0xf0, 0xeb, 0xd0}}
 
 
 // Definition of SkuId Array
diff --git a/efi_memtest/memtest86+/efi/Include/Efi_Defs_GUID.h b/efi_memtest/memtest86+/efi/Include/Efi_Defs_GUID.h
index 195a764..8c649b0 100644
--- a/efi_memtest/memtest86+/efi/Include/Efi_Defs_GUID.h
+++ b/efi_memtest/memtest86+/efi/Include/Efi_Defs_GUID.h
@@ -1,3 +1,29 @@
+#ifndef __EFI_DEFS_GUID_H__
+#define __EFI_DEFS_GUID_H__
+
+#define ACPI_TABLE_GUID { 0xEB9D2D30, 0x2D88, 0x11D3, { 0x9A, 0x16, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
+extern EFI_GUID gEfiAcpiTableGuid;
+
+#define EFI_ACPI_TABLE_GUID { 0x8868E871, 0xE4F1, 0x11D3, { 0xBC, 0x22, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}
+
+#define EFI_ACPI_10_TABLE_GUID     ACPI_TABLE_GUID
+extern EFI_GUID gEfiAcpi10TableGuid;
+
+//
+// ACPI 2.0 or newer tables should use EFI_ACPI_TABLE_GUID.
+//
+#define EFI_ACPI_20_TABLE_GUID EFI_ACPI_TABLE_GUID
+extern EFI_GUID gEfiAcpi20TableGuid;
+
+#define EFI_CALLER_ID_GUID \
+  {0x51d8cae0, 0x272a, 0x661f, {0xa8, 0xd9, 0x84, 0x51, 0xdf, 0xf0, 0xeb, 0xd0}}
+extern EFI_GUID gEfiCallerIdGUID;
+
+#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID  { 0x964E5B22, 0x6459, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
+extern EFI_GUID gEfiSimpleFileSystemProtocolGuid;
+
+#endif
+
 // Guids
 /*extern EFI_GUID gEfiMdePkgTokenSpaceGuid;
 extern EFI_GUID gEfiVTUTF8Guid;
@@ -13,8 +39,8 @@ extern EFI_GUID gEfiPersistentVirtualCdGuid;
 extern EFI_GUID gEfiEventReadyToBootGuid;
 extern EFI_GUID gEfiEventLegacyBootGuid;
 extern EFI_GUID gEfiGlobalVariableGuid; */
-extern EFI_GUID gEfiAcpi20TableGuid;
-extern EFI_GUID gEfiAcpi10TableGuid;
+
+
 
 // Protocols
 /*extern EFI_GUID gEfiDevicePathProtocolGuid;
@@ -23,7 +49,6 @@ extern EFI_GUID gEfiDriverBindingProtocolGuid;
 extern EFI_GUID gEfiSimpleTextOutProtocolGuid;
 extern EFI_GUID gEfiGraphicsOutputProtocolGuid;
 extern EFI_GUID gEfiHiiFontProtocolGuid; */
-extern const EFI_GUID gEfiSimpleFileSystemProtocolGuid;
 /*
 extern EFI_GUID gEfiUgaDrawProtocolGuid;
 extern EFI_GUID gEfiComponentNameProtocolGuid;
diff --git a/efi_memtest/memtest86+/efi/Include/Guid/Acpi.h b/efi_memtest/memtest86+/efi/Include/Guid/Acpi.h
index 8319b4d..3fff911 100644
--- a/efi_memtest/memtest86+/efi/Include/Guid/Acpi.h
+++ b/efi_memtest/memtest86+/efi/Include/Guid/Acpi.h
@@ -13,30 +13,4 @@
 

 **/

 

-#ifndef __ACPI_GUID_H__

-#define __ACPI_GUID_H__

-

 #include "Efi_Defs_GUID.h"

-

-#define ACPI_TABLE_GUID \

-  { \

-    0xeb9d2d30, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \

-  }

-

-#define EFI_ACPI_TABLE_GUID \

-  { \

-    0x8868e871, 0xe4f1, 0x11d3, {0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \

-  }

-

-#define ACPI_10_TABLE_GUID     ACPI_TABLE_GUID

-

-//

-// ACPI 2.0 or newer tables should use EFI_ACPI_TABLE_GUID.

-//

-#define EFI_ACPI_20_TABLE_GUID EFI_ACPI_TABLE_GUID

-

-/*extern EFI_GUID gEfiAcpiTableGuid;

-extern EFI_GUID gEfiAcpi10TableGuid;

-extern EFI_GUID gEfiAcpi20TableGuid;*/

-

-#endif

diff --git a/efi_memtest/memtest86+/efi/logger.c b/efi_memtest/memtest86+/efi/logger.c
index eb3211a..e9c1385 100644
--- a/efi_memtest/memtest86+/efi/logger.c
+++ b/efi_memtest/memtest86+/efi/logger.c
@@ -22,7 +22,7 @@ EFI_STATUS efiStatus;
 EFI_BOOT_SERVICES* bs;
 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *Console;
 
-EFI_GUID sfspGuid = gEfiSimpleFileSystemProtocolGuid;
+EFI_GUID sfspGuid = EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
 
 EFI_HANDLE* handleBuffer = NULL;
 UINTN handleCount = 0;
@@ -52,11 +52,7 @@ BOOLEAN compareGuids(EFI_GUID* sfspGuid, EFI_GUID* guid) {
               && guid->Data4[2] == sfspGuid->Data4[2] && guid->Data4[3] == sfspGuid->Data4[3]
               && guid->Data4[4] == sfspGuid->Data4[4] && guid->Data4[5] == sfspGuid->Data4[5]
               && guid->Data4[6] == sfspGuid->Data4[6] && guid->Data4[7] == sfspGuid->Data4[7]) {
-/*
-            Print(L"GUID: %x-%x-%x-%x-%x-%x-%x-%x-%x-%x-%x\n",
-                  guid->Data1, guid->Data2, guid->Data3,
-                  guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
-                  guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);*/
+
             return TRUE;
   }
   return FALSE;
@@ -418,4 +414,10 @@ void print_log_n(int log_flag, char *msg, ulong num) {
                 int_to_charr(num, log, &length);
                 print_log(log, length);
             }
-}
\ No newline at end of file
+}
+
+/*
+            Print(L"GUID: %x-%x-%x-%x-%x-%x-%x-%x-%x-%x-%x\n",
+                  guid->Data1, guid->Data2, guid->Data3,
+                  guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
+                  guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);*/
\ No newline at end of file