d3539132cd
Framebuffer split. * commands/i386/pc/vbetest.c (grub_cmd_vbetest): Restore video subsystem at the end. * conf/common.rmk (pkglib_MODULES): Add video_fb.mod. (video_fb_mod_SOURCES): New variable. (video_fb_mod_CFLAGS): Likewise. (video_fb_mod_LDFLAGS): Likewise. * conf/i386-pc.rmk (vbe_mod_SOURCES): Remove video/i386/pc/vbeblit.c, video/i386/pc/vbefill.c and video/i386/pc/vbeutil.c. * video/i386/pc/vbeblit.c: Moved from here ... * video/fb/fbblit.c: ..here. Replaced 'vbe' with 'fb'. * video/i386/pc/vbefill.c: Moved from here ... * video/fb/fbfill.c: ..here. Replaced 'vbe' with 'fb'. * video/i386/pc/vbeutil.c: Moved from here ... * video/fb/fbutil.c: ..here. Replaced 'vbe' with 'fb'. * include/grub/i386/pc/vbeblit.h: Moved from here ... * include/grub/fbblit.h: ... here. Replaced 'vbe' with 'fb'. * include/grub/i386/pc/vbefill.h: Moved from here ... * include/grub/fbfill.h: ... here. Replaced 'vbe' with 'fb'. * include/grub/i386/pc/vbeutil.h: Moved from here ... * include/grub/fbutil.h: ... here. Replaced 'vbe' with 'fb'. * include/grub/i386/pc/vbe.h: Moved framebuffer part ... * include/grub/video_fb.h: ... here. Replaced 'vbe' with 'fb'. * include/grub/video.h (GRUB_VIDEO_RENDER_TARGET_FRONT_BUFFER): Removed. (GRUB_VIDEO_RENDER_TARGET_BACK_BUFFER): Likewise. (grub_video_adapter): Added 'get_info_and_fini'. (grub_video_get_info_and_fini): New prototype. (grub_video_set_mode): make modestring const char *. * loader/i386/linux.c (grub_linux_setup_video): Use grub_video_get_info_and_fini. (grub_linux_boot): Move modesetting just before booting. * loader/i386/pc/xnu.c (grub_xnu_set_video): Use grub_video_get_info_and_fini. * video/i386/pc/vbe.c: Moved framebuffer part ... * video/fb/video_fb.c: ... here. Replaced 'vbe' with 'fb'. * video/i386/pc/vbe.c (grub_vbe_set_video_mode): Use grub_video_fbstd_colors and grub_video_fb_set_palette. (grub_video_vbe_init): Clear 'framebuffer' variable and use grub_video_fb_init. (grub_video_vbe_fini): Use grub_video_fb_fini. (grub_video_vbe_setup): Use framebuffer.render_target instead of render_target and use grub_video_fb_set_active_render_target and grub_video_fb_set_palette. (grub_video_vbe_set_palette): Use grub_video_fb_set_palette. (grub_video_vbe_set_viewport): Use grub_video_fb_set_viewport. (grub_video_vbe_adapter): Use framebuffer. * video/video.c (grub_video_get_info_and_fini): New function. (grub_video_set_mode): Make modestring const char *. (GRUB_MOD_INIT(video_video)): Don't set variables to 0 since these values are already initialised.
106 lines
3 KiB
C
106 lines
3 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2009 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <grub/env.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/xnu.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/cpu/xnu.h>
|
|
#include <grub/video_fb.h>
|
|
|
|
#define min(a,b) (((a) < (b)) ? (a) : (b))
|
|
#define max(a,b) (((a) > (b)) ? (a) : (b))
|
|
|
|
#define DEFAULT_VIDEO_MODE "1024x768x32,800x600x32,640x480x32"
|
|
|
|
static int NESTED_FUNC_ATTR video_hook (grub_video_adapter_t p __attribute__ ((unused)),
|
|
struct grub_video_mode_info *info)
|
|
{
|
|
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PURE_TEXT)
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* Setup video for xnu. */
|
|
grub_err_t
|
|
grub_xnu_set_video (struct grub_xnu_boot_params *params)
|
|
{
|
|
struct grub_video_mode_info mode_info;
|
|
int ret;
|
|
int x,y;
|
|
char *tmp, *modevar;
|
|
void *framebuffer;
|
|
grub_err_t err;
|
|
|
|
modevar = grub_env_get ("gfxpayload");
|
|
if (! modevar || *modevar == 0)
|
|
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, video_hook);
|
|
else
|
|
{
|
|
tmp = grub_malloc (grub_strlen (modevar)
|
|
+ sizeof (DEFAULT_VIDEO_MODE) + 1);
|
|
if (! tmp)
|
|
return grub_error (GRUB_ERR_OUT_OF_MEMORY,
|
|
"couldn't allocate temporary storag");
|
|
grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
|
|
err = grub_video_set_mode (tmp, video_hook);
|
|
grub_free (tmp);
|
|
}
|
|
|
|
if (err)
|
|
return err;
|
|
|
|
ret = grub_video_get_info_and_fini (&mode_info, &framebuffer);
|
|
if (ret)
|
|
return grub_error (GRUB_ERR_IO, "couldn't retrieve video parameters");
|
|
|
|
err = GRUB_ERR_NONE;
|
|
x = mode_info.width - grub_xnu_bitmap->mode_info.width;
|
|
x /= 2;
|
|
y = mode_info.height - grub_xnu_bitmap->mode_info.height;
|
|
y /= 2;
|
|
err = grub_video_blit_bitmap (grub_xnu_bitmap,
|
|
GRUB_VIDEO_BLIT_REPLACE,
|
|
x > 0 ? x : 0,
|
|
y > 0 ? y : 0,
|
|
x < 0 ? -x : 0,
|
|
y < 0 ? -y : 0,
|
|
min (grub_xnu_bitmap->mode_info.width,
|
|
mode_info.width),
|
|
min (grub_xnu_bitmap->mode_info.height,
|
|
mode_info.height));
|
|
if (err)
|
|
{
|
|
grub_print_error ();
|
|
grub_errno = GRUB_ERR_NONE;
|
|
grub_xnu_bitmap = 0;
|
|
}
|
|
|
|
params->lfb_width = mode_info.width;
|
|
params->lfb_height = mode_info.height;
|
|
params->lfb_depth = mode_info.bpp;
|
|
params->lfb_line_len = mode_info.pitch;
|
|
|
|
params->lfb_base = PTR_TO_UINT32 (framebuffer);
|
|
params->lfb_mode = grub_xnu_bitmap
|
|
? GRUB_XNU_VIDEO_SPLASH : GRUB_XNU_VIDEO_TEXT_IN_VIDEO;
|
|
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|