vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove nested functions from videoinfo iterators.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-01 11:11:36 +01:00
parent e230377407
commit 3056d3e752
5 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
grub-core/video/efi_gop.c
View file

@ -42,7 +42,7 @@ static int restore_needed;
static grub_efi_handle_t gop_handle;
static int
grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info));
grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, void *hook_arg), void *hook_arg);
static struct
{
@ -52,6 +52,14 @@ static struct
grub_uint8_t *offscreen;
} framebuffer;
static int
check_protocol_hook (const struct grub_video_mode_info *info __attribute__ ((unused)), void *hook_arg)
{
int *have_usable_mode = hook_arg;
*have_usable_mode = 1;
return 1;
}
static int
check_protocol (void)
@ -60,13 +68,6 @@ check_protocol (void)
grub_efi_uintn_t num_handles, i;
int have_usable_mode = 0;
auto int hook (const struct grub_video_mode_info *info);
int hook (const struct grub_video_mode_info *info __attribute__ ((unused)))
{
have_usable_mode = 1;
return 1;
}
handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL,
&graphics_output_guid, NULL, &num_handles);
if (!handles || num_handles == 0)
@ -77,7 +78,7 @@ check_protocol (void)
gop_handle = handles[i];
gop = grub_efi_open_protocol (gop_handle, &graphics_output_guid,
GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
grub_video_gop_iterate (hook);
grub_video_gop_iterate (check_protocol_hook, &have_usable_mode);
if (have_usable_mode)
{
grub_free (handles);
@ -256,7 +257,7 @@ grub_video_gop_fill_mode_info (unsigned mode,
}
static int
grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info))
grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, void *hook_arg), void *hook_arg)
{
unsigned mode;
@ -282,7 +283,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info))
grub_errno = GRUB_ERR_NONE;
continue;
}
if (hook (&mode_info))
if (hook (&mode_info, hook_arg))
return 1;
}
return 0;