Version 0.6.7 release.

[refind] / refind / global.h

diff --git a/refind/global.h b/refind/global.h
index 1d4a1842d6c31b5e8e808925607de1f0df1d4ddd..edf9244c52ac69326521e44084462c4abcb99a1f 100644 (file)
--- a/refind/global.h
+++ b/refind/global.h
@@ -35,11 +35,11 @@
  */
 /*
  * Modifications copyright (c) 2012 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
  * with this source code or binaries made from it.
- * 
+ *
  */
 
 #ifndef __GLOBAL_H_
@@ -88,7 +88,7 @@
 #define LEGACY_TYPE_MAC  1
 #define LEGACY_TYPE_UEFI 2
 
-#ifndef __MAKEWITH_TIANO
+#ifdef __MAKEWITH_GNUEFI
 //
 // define BBS Device Types
 //
@@ -120,6 +120,12 @@
 #define FS_TYPE_REISERFS       6
 #define FS_TYPE_ISO9660        7
 
+// 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\\altlinux"
+
 //
 // global definitions
 //
@@ -144,6 +150,7 @@ typedef struct {
    EFI_HANDLE          DeviceHandle;
    EFI_FILE            *RootDir;
    CHAR16              *VolName;
+   UINTN               VolNumber;
    EG_IMAGE            *VolIconImage;
    EG_IMAGE            *VolBadgeImage;
    UINTN               DiskKind;
@@ -182,6 +189,8 @@ typedef struct _refit_menu_screen {
    REFIT_MENU_ENTRY **Entries;
    UINTN       TimeoutSeconds;
    CHAR16      *TimeoutText;
+   CHAR16      *Hint1;
+   CHAR16      *Hint2;
 } REFIT_MENU_SCREEN;
 
 typedef struct {
@@ -200,9 +209,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;
@@ -212,6 +221,7 @@ typedef struct {
    BOOLEAN     ScanAllLinux;
    UINTN       RequestedScreenWidth;
    UINTN       RequestedScreenHeight;
+   UINTN       BannerBottomEdge;
    UINTN       RequestedTextMode;
    UINTN       Timeout;
    UINTN       HideUIFlags;
@@ -220,6 +230,7 @@ typedef struct {
    UINTN       LegacyType;
    UINTN       ScanDelay;
    CHAR16      *BannerFileName;
+   EG_IMAGE    *ScreenBackground;
    CHAR16      *SelectionSmallFileName;
    CHAR16      *SelectionBigFileName;
    CHAR16      *DefaultSelection;