Added support for "-c" command-line parameter to rEFInd, to specify

[refind] / refind / global.h

diff --git a/refind/global.h b/refind/global.h
index 419ed8a8a50bd7960611aac445a0c37606963942..8dc6d594ac8300167604aa7311d5ab40471ce6d6 100644 (file)
--- a/refind/global.h
+++ b/refind/global.h
@@ -71,7 +71,8 @@
 #define TAG_APPLE_RECOVERY (11)
 #define TAG_MOK_TOOL       (12)
 #define TAG_FIRMWARE       (13)
-#define NUM_TOOLS          (13)
+#define TAG_MEMTEST        (14)
+#define NUM_TOOLS          (14)
 
 #define NUM_SCAN_OPTIONS 10
 
@@ -127,6 +128,8 @@
 // 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"
+// Directories to search for memtest86....
+#define MEMTEST_LOCATIONS       L"EFI\\tools,EFI\\tools\\memtest86,EFI\\tools\\memtest,EFI\\memtest86,EFI\\memtest"
 
 //
 // global definitions
@@ -152,6 +155,7 @@ typedef struct {
    EFI_HANDLE          DeviceHandle;
    EFI_FILE            *RootDir;
    CHAR16              *VolName;
+   EFI_GUID            VolUuid;
    UINTN               VolNumber;
    EG_IMAGE            *VolIconImage;
    EG_IMAGE            *VolBadgeImage;
@@ -234,6 +238,7 @@ typedef struct {
    UINTN       ScreensaverTime;
    CHAR16      *BannerFileName;
    EG_IMAGE    *ScreenBackground;
+   CHAR16      *ConfigFilename;
    CHAR16      *SelectionSmallFileName;
    CHAR16      *SelectionBigFileName;
    CHAR16      *DefaultSelection;
@@ -271,7 +276,6 @@ LOADER_ENTRY * MakeGenericLoaderEntry(VOID);
 LOADER_ENTRY * AddLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Volume);
 VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume);
 LOADER_ENTRY * AddPreparedLoaderEntry(LOADER_ENTRY *Entry);
-VOID disable_secure_boot(VOID);
 
 #endif