X-Git-Url: https://code.delx.au/refind/blobdiff_plain/f750551a23ac517385f105b7de582b6e45616266..f92a7032373fc63e9d8946574d4fb42464d1c916:/refind/global.h

diff --git a/refind/global.h b/refind/global.h
index 8ad30f5..33087c2 100644
--- a/refind/global.h
+++ b/refind/global.h
@@ -121,16 +121,18 @@
 
 // Filesystem type identifiers. Not all are yet used....
 #define FS_TYPE_UNKNOWN        0
-#define FS_TYPE_FAT            1
-#define FS_TYPE_EXFAT          2
-#define FS_TYPE_NTFS           3
-#define FS_TYPE_EXT2           4
-#define FS_TYPE_EXT3           5
-#define FS_TYPE_EXT4           6
-#define FS_TYPE_HFSPLUS        7
-#define FS_TYPE_REISERFS       8
-#define FS_TYPE_BTRFS          9
-#define FS_TYPE_ISO9660        10
+#define FS_TYPE_WHOLEDISK      1
+#define FS_TYPE_FAT            2
+#define FS_TYPE_EXFAT          3
+#define FS_TYPE_NTFS           4
+#define FS_TYPE_EXT2           5
+#define FS_TYPE_EXT3           6
+#define FS_TYPE_EXT4           7
+#define FS_TYPE_HFSPLUS        8
+#define FS_TYPE_REISERFS       9
+#define FS_TYPE_BTRFS          10
+#define FS_TYPE_XFS            11
+#define FS_TYPE_ISO9660        12
 
 // How to scale banner images
 #define BANNER_NOSCALE         0
@@ -146,7 +148,7 @@
 #define ICON_SIZE_BIG   2
 
 // Names of binaries that can manage MOKs....
-#define MOK_NAMES               L"MokManager.efi,HashTool.efi,HashTool-signed.efi"
+#define MOK_NAMES               L"MokManager.efi,HashTool.efi,HashTool-signed.efi,KeyTool.efi,KeyTool-signed.efi"
 // Directories to search for these MOK-managing programs. Note that SelfDir is
 // searched in addition to these locations....
 #define MOK_LOCATIONS           L"\\,EFI\\tools,EFI\\fedora,EFI\\redhat,EFI\\ubuntu,EFI\\suse,EFI\\opensuse,EFI\\altlinux"
@@ -203,6 +205,7 @@ typedef struct {
    CHAR16              *PartName;
    EFI_GUID            VolUuid;
    EFI_GUID            PartGuid;
+   EFI_GUID            PartTypeGuid;
    UINTN               VolNumber;
    EG_IMAGE            *VolIconImage;
    EG_IMAGE            *VolBadgeImage;
@@ -268,38 +271,39 @@ typedef struct {
 } LEGACY_ENTRY;
 
 typedef struct {
-   BOOLEAN     TextOnly;
-   BOOLEAN     ScanAllLinux;
-   BOOLEAN     DeepLegacyScan;
-   BOOLEAN     EnableAndLockVMX;
-   UINTN       RequestedScreenWidth;
-   UINTN       RequestedScreenHeight;
-   UINTN       BannerBottomEdge;
-   UINTN       RequestedTextMode;
-   UINTN       Timeout;
-   UINTN       HideUIFlags;
-   UINTN       MaxTags;     // max. number of OS entries to show simultaneously in graphics mode
-   UINTN       GraphicsFor;
-   UINTN       LegacyType;
-   UINTN       ScanDelay;
-   UINTN       ScreensaverTime;
-   UINTN       IconSizes[3];
-   UINTN       BannerScale;
-   CHAR16      *BannerFileName;
-   EG_IMAGE    *ScreenBackground;
-   CHAR16      *ConfigFilename;
-   CHAR16      *SelectionSmallFileName;
-   CHAR16      *SelectionBigFileName;
-   CHAR16      *DefaultSelection;
-   CHAR16      *AlsoScan;
-   CHAR16      *DontScanVolumes;
-   CHAR16      *DontScanDirs;
-   CHAR16      *DontScanFiles;
-   CHAR16      *WindowsRecoveryFiles;
-   CHAR16      *DriverDirs;
-   CHAR16      *IconsDir;
-   UINTN       ShowTools[NUM_TOOLS];
-   CHAR8       ScanFor[NUM_SCAN_OPTIONS]; // codes of types of loaders for which to scan
+   BOOLEAN       TextOnly;
+   BOOLEAN       ScanAllLinux;
+   BOOLEAN       DeepLegacyScan;
+   BOOLEAN       EnableAndLockVMX;
+   UINTN         RequestedScreenWidth;
+   UINTN         RequestedScreenHeight;
+   UINTN         BannerBottomEdge;
+   UINTN         RequestedTextMode;
+   UINTN         Timeout;
+   UINTN         HideUIFlags;
+   UINTN         MaxTags;     // max. number of OS entries to show simultaneously in graphics mode
+   UINTN         GraphicsFor;
+   UINTN         LegacyType;
+   UINTN         ScanDelay;
+   UINTN         ScreensaverTime;
+   UINTN         IconSizes[3];
+   UINTN         BannerScale;
+   REFIT_VOLUME  *DiscoveredRoot;
+   CHAR16        *BannerFileName;
+   EG_IMAGE      *ScreenBackground;
+   CHAR16        *ConfigFilename;
+   CHAR16        *SelectionSmallFileName;
+   CHAR16        *SelectionBigFileName;
+   CHAR16        *DefaultSelection;
+   CHAR16        *AlsoScan;
+   CHAR16        *DontScanVolumes;
+   CHAR16        *DontScanDirs;
+   CHAR16        *DontScanFiles;
+   CHAR16        *WindowsRecoveryFiles;
+   CHAR16        *DriverDirs;
+   CHAR16        *IconsDir;
+   UINTN         ShowTools[NUM_TOOLS];
+   CHAR8         ScanFor[NUM_SCAN_OPTIONS]; // codes of types of loaders for which to scan
 } REFIT_CONFIG;
 
 // Global variables