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

netbsd framebuffer support

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-15 13:40:37 +01:00
parent 9766dafa74
commit 53fbae94a6
2 changed files with 116 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/grub/i386/bsd.h
View file

@ -212,6 +212,7 @@ struct grub_netbsd_bootinfo
#define NETBSD_BTINFO_CONSOLE 6
#define NETBSD_BTINFO_SYMTAB 8
#define NETBSD_BTINFO_MEMMAP 9
#define NETBSD_BTINFO_FRAMEBUF 12
struct grub_netbsd_btinfo_common
{
@ -248,6 +249,27 @@ struct grub_netbsd_btinfo_serial
grub_uint32_t speed;
};
struct grub_netbsd_btinfo_framebuf
{
grub_uint64_t fbaddr;
grub_uint32_t flags;
grub_uint32_t width;
grub_uint32_t height;
grub_uint16_t pitch;
grub_uint8_t bpp;
grub_uint8_t red_mask_size;
grub_uint8_t green_mask_size;
grub_uint8_t blue_mask_size;
grub_uint8_t red_field_pos;
grub_uint8_t green_field_pos;
grub_uint8_t blue_field_pos;
grub_uint8_t reserved[16];
};
#define GRUB_NETBSD_MAX_ROOTDEVICE_LEN 16
grub_err_t grub_freebsd_load_elfmodule32 (struct grub_relocator *relocator,

93
loader/i386/bsd.c
View file

@ -40,7 +40,13 @@
#endif
#ifdef GRUB_MACHINE_EFI
#include <grub/efi/efi.h>
#define NETBSD_DEFAULT_VIDEO_MODE "800x600"
#else
#define NETBSD_DEFAULT_VIDEO_MODE "text"
#include <grub/i386/pc/vbe.h>
#endif
#include <grub/video.h>
#include <grub/disk.h>
#include <grub/device.h>
#include <grub/partition.h>
@ -770,6 +776,85 @@ grub_openbsd_boot (void)
return grub_relocator32_boot (relocator, state);
}
static grub_err_t
grub_netbsd_setup_video (void)
{
struct grub_video_mode_info mode_info;
void *framebuffer;
const char *modevar;
struct grub_netbsd_btinfo_framebuf params;
grub_err_t err;
modevar = grub_env_get ("gfxpayload");
/* Now all graphical modes are acceptable.
May change in future if we have modes without framebuffer. */
if (modevar && *modevar != 0)
{
char *tmp;
tmp = grub_malloc (grub_strlen (modevar)
+ sizeof (";" NETBSD_DEFAULT_VIDEO_MODE));
if (! tmp)
return grub_errno;
grub_sprintf (tmp, "%s;" NETBSD_DEFAULT_VIDEO_MODE, modevar);
err = grub_video_set_mode (tmp, 0, 0);
grub_free (tmp);
}
else
err = grub_video_set_mode (NETBSD_DEFAULT_VIDEO_MODE, 0, 0);
if (err)
return err;
err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
if (err)
return err;
params.width = mode_info.width;
params.height = mode_info.height;
params.bpp = mode_info.bpp;
params.pitch = mode_info.pitch;
params.flags = 0;
params.fbaddr = (grub_addr_t) framebuffer;
params.red_mask_size = mode_info.red_mask_size;
params.red_field_pos = mode_info.red_field_pos;
params.green_mask_size = mode_info.green_mask_size;
params.green_field_pos = mode_info.green_field_pos;
params.blue_mask_size = mode_info.blue_mask_size;
params.blue_field_pos = mode_info.blue_field_pos;
#ifdef GRUB_MACHINE_PCBIOS
/* VESA packed modes may come with zeroed mask sizes, which need
to be set here according to DAC Palette width. If we don't,
this results in Linux displaying a black screen. */
if (mode_info.bpp <= 8)
{
struct grub_vbe_info_block controller_info;
int status;
int width = 8;
status = grub_vbe_bios_get_controller_info (&controller_info);
if (status == GRUB_VBE_STATUS_OK &&
(controller_info.capabilities & GRUB_VBE_CAPABILITY_DACWIDTH))
status = grub_vbe_bios_set_dac_palette_width (&width);
if (status != GRUB_VBE_STATUS_OK)
/* 6 is default after mode reset. */
width = 6;
params.red_mask_size = params.green_mask_size
= params.blue_mask_size = width;
}
#endif
err = grub_bsd_add_meta (NETBSD_BTINFO_FRAMEBUF, &params, sizeof (params));
return err;
}
static grub_err_t
grub_netbsd_boot (void)
{
@ -786,6 +871,14 @@ grub_netbsd_boot (void)
if (err)
return err;
err = grub_netbsd_setup_video ();
if (err)
{
grub_print_error ();
grub_printf ("Booting however\n");
grub_errno = GRUB_ERR_NONE;
}
{
struct bsd_tag *tag;
tag_buf_len = 0;