Added support for "%v" as a variable for the kernel version number in

[refind] / refind / global.h

diff --git a/refind/global.h b/refind/global.h
index 875fc20464a4f30760309d39e8c686af31d2dbd5..0da3ff38c28d3c65daa40170568a6f9fee5fd646 100644 (file)
--- a/refind/global.h
+++ b/refind/global.h
@@ -75,7 +75,9 @@
 #define TAG_MEMTEST          (15)
 #define TAG_GDISK            (16)
 #define TAG_NETBOOT          (17)
-#define NUM_TOOLS            (18)
+#define TAG_CSR_ROTATE       (18)
+#define TAG_FWUPDATE_TOOL    (19)
+#define NUM_TOOLS            (20)
 
 #define NUM_SCAN_OPTIONS 10
 
@@ -149,6 +151,16 @@
 
 // Names of binaries that can manage MOKs....
 #define MOK_NAMES               L"MokManager.efi,HashTool.efi,HashTool-signed.efi,KeyTool.efi,KeyTool-signed.efi"
+// Names of binaries that can update firmware....
+#if defined (EFIX64)
+#define FWUPDATE_NAMES          L"fwupx64.efi"
+#elif defined(EFI32)
+#define FWUPDATE_NAMES          L"fwupia32.efi"
+#elif defined(EFIAARCH64)
+#define FWUPDATE_NAMES          L"fwupaa64.efi"
+#else
+#define FWUPDATE_NAMES          L"fwup.efi"
+#endif
 // 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"
@@ -157,6 +169,13 @@
 // Files that may be Windows recovery files
 #define WINDOWS_RECOVERY_FILES  L"EFI\\Microsoft\\Boot\\LrsBootmgr.efi,Recovery:\\EFI\\BOOT\\bootx64.efi,Recovery:\\EFI\\BOOT\\bootia32.efi"
 
+// Filename patterns that identify EFI boot loaders. Note that a single case (either L"*.efi" or
+// L"*.EFI") is fine for most systems; but Gigabyte's buggy Hybrid EFI does a case-sensitive
+// comparison when it should do a case-insensitive comparison, so I'm doubling this up. It does
+// no harm on other computers, AFAIK. In theory, every case variation should be done for
+// completeness, but that's ridiculous....
+#define LOADER_MATCH_PATTERNS   L"*.efi,*.EFI"
+
 // Definitions for the "hideui" option in refind.conf
 #define HIDEUI_FLAG_NONE       (0x0000)
 #define HIDEUI_FLAG_BANNER     (0x0001)
@@ -178,12 +197,20 @@
 #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} };
 
+// Configuration file variables
+#define KERNEL_VERSION L"%v"
+
 //
 // global definitions
 //
 
 // global types
 
+typedef struct _uint32_list {
+    UINT32               Value;
+    struct _uint32_list  *Next;
+} UINT32_LIST;
+
 typedef struct {
    UINT8 Flags;
    UINT8 StartCHS1;
@@ -277,6 +304,7 @@ typedef struct {
    BOOLEAN          DeepLegacyScan;
    BOOLEAN          EnableAndLockVMX;
    BOOLEAN          FoldLinuxKernels;
+   BOOLEAN          EnableTouch;
    UINTN            RequestedScreenWidth;
    UINTN            RequestedScreenHeight;
    UINTN            BannerBottomEdge;
@@ -305,6 +333,8 @@ typedef struct {
    CHAR16           *WindowsRecoveryFiles;
    CHAR16           *DriverDirs;
    CHAR16           *IconsDir;
+   CHAR16           *SpoofOSXVersion;
+   UINT32_LIST      *CsrValues;
    UINTN            ShowTools[NUM_TOOLS];
    CHAR8            ScanFor[NUM_SCAN_OPTIONS]; // codes of types of loaders for which to scan
 } REFIT_CONFIG;
@@ -332,6 +362,12 @@ EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths,
                              OUT UINTN *ErrorInStep,
                              IN BOOLEAN Verbose,
                              IN BOOLEAN IsDriver);
+EFI_STATUS StartEFIImage(IN EFI_DEVICE_PATH *DevicePath,
+                         IN CHAR16 *LoadOptions, IN UINTN LoaderType,
+                         IN CHAR16 *ImageTitle, IN CHAR8 OSType,
+                         OUT UINTN *ErrorInStep,
+                         IN BOOLEAN Verbose,
+                         IN BOOLEAN IsDriver);
 LOADER_ENTRY *InitializeLoaderEntry(IN LOADER_ENTRY *Entry);
 REFIT_MENU_SCREEN *InitializeSubScreen(IN LOADER_ENTRY *Entry);
 VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume, IN BOOLEAN GenerateReturn);