Version 0.8.2 release; refinement to last-booted as default selection

[refind] / refind / global.h

diff --git a/refind/global.h b/refind/global.h
index c45acda50be19c4d9ab197f62a95eb71f304d4a8..95ac32f19fb6ad00d3bfb9f28d4ffe11ca7c4114 100644 (file)
--- a/refind/global.h
+++ b/refind/global.h
@@ -50,8 +50,8 @@
 #include <efilib.h>
 #else
 #include "../include/tiano_includes.h"
-#include "../EfiLib/GenericBdsLib.h"
 #endif
+#include "../EfiLib/GenericBdsLib.h"
 
 #include "libeg.h"
 
@@ -73,7 +73,8 @@
 #define TAG_MOK_TOOL         (13)
 #define TAG_FIRMWARE         (14)
 #define TAG_MEMTEST          (15)
-#define NUM_TOOLS            (16)
+#define TAG_GDISK            (16)
+#define NUM_TOOLS            (17)
 
 #define NUM_SCAN_OPTIONS 10
 
@@ -147,6 +148,9 @@
 // Files that may be Windows recovery files
 #define WINDOWS_RECOVERY_FILES  L"EFI\\Microsoft\\Boot\\LrsBootmgr.efi"
 
+#define NULL_GUID_VALUE { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+#define REFIND_GUID_VALUE { 0x36D08FA7, 0xCF0B, 0x42F5, {0x8F, 0x14, 0x68, 0xDF, 0x73, 0xED, 0x37, 0x40} };
+
 //
 // global definitions
 //
@@ -171,7 +175,9 @@ typedef struct {
    EFI_HANDLE          DeviceHandle;
    EFI_FILE            *RootDir;
    CHAR16              *VolName;
+   CHAR16              *PartName;
    EFI_GUID            VolUuid;
+   EFI_GUID            PartGuid;
    UINTN               VolNumber;
    EG_IMAGE            *VolIconImage;
    EG_IMAGE            *VolBadgeImage;
@@ -231,9 +237,7 @@ typedef struct {
 typedef struct {
    REFIT_MENU_ENTRY  me;
    REFIT_VOLUME      *Volume;
-#ifndef __MAKEWITH_GNUEFI
    BDS_COMMON_OPTION *BdsOption;
-#endif
    CHAR16            *LoadOptions;
    BOOLEAN           Enabled;
 } LEGACY_ENTRY;
@@ -241,6 +245,7 @@ typedef struct {
 typedef struct {
    BOOLEAN     TextOnly;
    BOOLEAN     ScanAllLinux;
+   BOOLEAN     DeepLegacyScan;
    UINTN       RequestedScreenWidth;
    UINTN       RequestedScreenHeight;
    UINTN       BannerBottomEdge;