Merge commit '66d7ba273b64a6dd5987c32b5c3bc849b9fa9f16'

[refind] / refind / icns.h

diff --git a/refind/icns.h b/refind/icns.h
index 46c42368c741c6ffd27061fe99aec92140c66316..17e91ee468bea32d94868c2432ba08bb1971ca3d 100644 (file)
--- a/refind/icns.h
+++ b/refind/icns.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-2015 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
@@ -51,24 +51,28 @@
 
 EG_IMAGE * LoadOSIcon(IN CHAR16 *OSIconName OPTIONAL, IN CHAR16 *FallbackIconName, BOOLEAN BootLogo);
 
-EG_IMAGE * LoadIcns(IN EFI_FILE_HANDLE BaseDir, IN CHAR16 *FileName, IN UINTN PixelSize);
 EG_IMAGE * DummyImage(IN UINTN PixelSize);
 
 EG_IMAGE * BuiltinIcon(IN UINTN Id);
 
-#define BUILTIN_ICON_FUNC_ABOUT     (0)
-#define BUILTIN_ICON_FUNC_RESET     (1)
-#define BUILTIN_ICON_FUNC_SHUTDOWN  (2)
-#define BUILTIN_ICON_FUNC_EXIT      (3)
-#define BUILTIN_ICON_TOOL_SHELL     (4)
-#define BUILTIN_ICON_TOOL_PART      (5)
-#define BUILTIN_ICON_TOOL_RESCUE    (6)
-#define BUILTIN_ICON_TOOL_APPLE_RESCUE (7)
-#define BUILTIN_ICON_TOOL_MOK_TOOL  (8)
-#define BUILTIN_ICON_VOL_INTERNAL   (9)
-#define BUILTIN_ICON_VOL_EXTERNAL   (10)
-#define BUILTIN_ICON_VOL_OPTICAL    (11)
-#define BUILTIN_ICON_COUNT          (12)
+#define BUILTIN_ICON_FUNC_ABOUT            (0)
+#define BUILTIN_ICON_FUNC_RESET            (1)
+#define BUILTIN_ICON_FUNC_SHUTDOWN         (2)
+#define BUILTIN_ICON_FUNC_EXIT             (3)
+#define BUILTIN_ICON_FUNC_FIRMWARE         (4)
+#define BUILTIN_ICON_TOOL_SHELL            (5)
+#define BUILTIN_ICON_TOOL_PART             (6)
+#define BUILTIN_ICON_TOOL_RESCUE           (7)
+#define BUILTIN_ICON_TOOL_APPLE_RESCUE     (8)
+#define BUILTIN_ICON_TOOL_WINDOWS_RESCUE   (9)
+#define BUILTIN_ICON_TOOL_MOK_TOOL         (10)
+#define BUILTIN_ICON_TOOL_MEMTEST          (11)
+#define BUILTIN_ICON_TOOL_NETBOOT          (12)
+#define BUILTIN_ICON_VOL_INTERNAL          (13)
+#define BUILTIN_ICON_VOL_EXTERNAL          (14)
+#define BUILTIN_ICON_VOL_OPTICAL           (15)
+#define BUILTIN_ICON_VOL_NET               (16)
+#define BUILTIN_ICON_COUNT                 (17)
 
 #endif