X-Git-Url: https://code.delx.au/refind/blobdiff_plain/d2370de648f795ccdf7fe76786c9516568cbe529..69d48aa1764ec9c931a2463cb3a5bc9de94f7499:/refind/global.h

diff --git a/refind/global.h b/refind/global.h
index 511dcac..e6d4b4b 100644
--- a/refind/global.h
+++ b/refind/global.h
@@ -34,7 +34,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * Modifications copyright (c) 2012 Roderick W. Smith
+ * Modifications copyright (c) 2012-2013 Roderick W. Smith
  *
  * Modifications distributed under the terms of the GNU General Public
  * License (GPL) version 3 (GPLv3), a copy of which must be distributed
@@ -70,7 +70,9 @@
 #define TAG_LEGACY_UEFI    (10)
 #define TAG_APPLE_RECOVERY (11)
 #define TAG_MOK_TOOL       (12)
-#define NUM_TOOLS          (11)
+#define TAG_FIRMWARE       (13)
+#define TAG_MEMTEST        (14)
+#define NUM_TOOLS          (14)
 
 #define NUM_SCAN_OPTIONS 10
 
@@ -88,7 +90,7 @@
 #define LEGACY_TYPE_MAC  1
 #define LEGACY_TYPE_UEFI 2
 
-#ifndef __MAKEWITH_TIANO
+#ifdef __MAKEWITH_GNUEFI
 //
 // define BBS Device Types
 //
@@ -118,7 +120,16 @@
 #define FS_TYPE_EXT4           4
 #define FS_TYPE_HFSPLUS        5
 #define FS_TYPE_REISERFS       6
-#define FS_TYPE_ISO9660        7
+#define FS_TYPE_BTRFS          7
+#define FS_TYPE_ISO9660        8
+
+// Names of binaries that can manage MOKs....
+#define MOK_NAMES               L"MokManager.efi,HashTool.efi,HashTool-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"
+// Directories to search for memtest86....
+#define MEMTEST_LOCATIONS       L"EFI\\tools,EFI\\tools\\memtest86,EFI\\tools\\memtest,EFI\\memtest86,EFI\\memtest"
 
 //
 // global definitions
@@ -144,6 +155,8 @@ typedef struct {
    EFI_HANDLE          DeviceHandle;
    EFI_FILE            *RootDir;
    CHAR16              *VolName;
+   EFI_GUID            VolUuid;
+   UINTN               VolNumber;
    EG_IMAGE            *VolIconImage;
    EG_IMAGE            *VolBadgeImage;
    UINTN               DiskKind;
@@ -202,9 +215,9 @@ typedef struct {
 typedef struct {
    REFIT_MENU_ENTRY  me;
    REFIT_VOLUME      *Volume;
-#ifdef __MAKEWITH_TIANO
+#ifndef __MAKEWITH_GNUEFI
    BDS_COMMON_OPTION *BdsOption;
-#endif // __MAKEWITH_TIANO
+#endif
    CHAR16            *LoadOptions;
    BOOLEAN           Enabled;
 } LEGACY_ENTRY;
@@ -214,6 +227,7 @@ typedef struct {
    BOOLEAN     ScanAllLinux;
    UINTN       RequestedScreenWidth;
    UINTN       RequestedScreenHeight;
+   UINTN       BannerBottomEdge;
    UINTN       RequestedTextMode;
    UINTN       Timeout;
    UINTN       HideUIFlags;
@@ -221,7 +235,9 @@ typedef struct {
    UINTN       GraphicsFor;
    UINTN       LegacyType;
    UINTN       ScanDelay;
+   UINTN       ScreensaverTime;
    CHAR16      *BannerFileName;
+   EG_IMAGE    *ScreenBackground;
    CHAR16      *SelectionSmallFileName;
    CHAR16      *SelectionBigFileName;
    CHAR16      *DefaultSelection;