merge efigfx into newreloc

include/grub/i386/xnu.h

@@ -114,7 +114,5 @@ extern grub_uint32_t grub_xnu_stack;
 extern grub_uint32_t grub_xnu_arg1;
 extern char grub_xnu_cmdline[1024];
 grub_err_t grub_xnu_boot (void);
-grub_err_t grub_xnu_set_video (struct grub_xnu_boot_params *bootparams_relloc);
-grub_err_t
-grub_cpu_xnu_fill_devicetree (void);
+grub_err_t grub_cpu_xnu_fill_devicetree (void);
 #endif

include/grub/video.h

@@ -180,7 +180,7 @@ struct grub_video_adapter
   grub_err_t (*fini) (void);
 
   grub_err_t (*setup) (unsigned int width,  unsigned int height,
-                       unsigned int mode_type);
+                       unsigned int mode_type, unsigned int mode_mask);
 
   grub_err_t (*get_info) (struct grub_video_mode_info *mode_info);
 
@@ -316,8 +316,17 @@ grub_err_t grub_video_set_active_render_target (struct grub_video_render_target
 grub_err_t grub_video_get_active_render_target (struct grub_video_render_target **target);
 
 grub_err_t grub_video_set_mode (const char *modestring,
-				int NESTED_FUNC_ATTR (*hook) (grub_video_adapter_t p,
-							      struct grub_video_mode_info *mode_info));
-grub_video_driver_id_t grub_video_get_driver_id (void);
+				unsigned int modemask,
+				unsigned int modevalue);
+
+static inline int
+grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
+			    unsigned int flag, int def)
+{
+  return (flag & mask) ? !! (flags & flag) : def;
+}
+
+grub_video_driver_id_t
+grub_video_get_driver_id (void);
 
 #endif /* ! GRUB_VIDEO_HEADER */