Return of PoolPrint() function; modified launch code to include

[refind] / refind / global.h

diff --git a/refind/global.h b/refind/global.h
index 0aad5f10f3c7d1c195477d954eb2ba12a1db57b6..ddcc24ecc318f27111b71dfd116ea34fc6747f3e 100644 (file)
--- 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
 
@@ -118,13 +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\\altlinux"
+#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