Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: Make sure Limine UEFI still works without GRAPHICS=yes and/or with TIMEOUT=0

Browse Source
This commit is contained in:
mintsuki 2021-03-10 05:08:37 +01:00
parent 7f32fb591b
commit 0cd183faf4
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
stage23/entry.s3.c
View File

@ -30,10 +30,23 @@ EFI_STATUS EFIAPI efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable
gRT = SystemTable->RuntimeServices;
efi_image_handle = ImageHandle;
print("Limine " LIMINE_VERSION "\n\n", print);
init_memmap();
uint32_t colourscheme[] = {
0x00000000, // black
0x00aa0000, // red
0x0000aa00, // green
0x00aa5500, // brown
0x000000aa, // blue
0x00aa00aa, // magenta
0x0000aaaa, // cyan
0x00aaaaaa // grey
};
term_vbe(colourscheme, 64, 0, NULL);
print("Limine " LIMINE_VERSION "\n\n", print);
disk_create_index();
EFI_GUID loaded_img_prot_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;

18
stage23/lib/gterm.c
View File

@ -24,7 +24,7 @@ static uint16_t gterm_bpp;
extern symbol _binary_font_bin_start;
static uint8_t *vga_font;
static uint8_t *vga_font = NULL;
static uint32_t ansi_colours[8];
@ -32,8 +32,8 @@ static int frame_height, frame_width;
static struct image *background;
static struct gterm_char *grid;
static struct gterm_char *front_grid;
static struct gterm_char *grid = NULL;
static struct gterm_char *front_grid = NULL;
static bool double_buffer_enabled = false;
@ -372,7 +372,10 @@ bool gterm_init(int *_rows, int *_cols, uint32_t *_colours, int _margin, int _ma
mtrr_set_range((uint64_t)(size_t)gterm_framebuffer,
(uint64_t)gterm_pitch * gterm_height, MTRR_MEMORY_TYPE_WC);
vga_font = (void *)_binary_font_bin_start;
if (vga_font == NULL)
vga_font = ext_mem_alloc(VGA_FONT_MAX);
memcpy(vga_font, (void *)_binary_font_bin_start, VGA_FONT_MAX);
char *menu_font = config_get_value(NULL, 0, "MENU_FONT");
if (menu_font != NULL) {
@ -380,15 +383,16 @@ bool gterm_init(int *_rows, int *_cols, uint32_t *_colours, int _margin, int _ma
if (!uri_open(&f, menu_font)) {
print("menu: Could not open font file.\n");
} else {
vga_font = ext_mem_alloc(VGA_FONT_MAX);
fread(&f, vga_font, 0, VGA_FONT_MAX);
}
}
*_cols = cols = (gterm_width - _margin * 2) / VGA_FONT_WIDTH;
*_rows = rows = (gterm_height - _margin * 2) / VGA_FONT_HEIGHT;
grid = ext_mem_alloc(rows * cols * sizeof(struct gterm_char));
front_grid = ext_mem_alloc(rows * cols * sizeof(struct gterm_char));
if (grid == NULL)
grid = ext_mem_alloc(rows * cols * sizeof(struct gterm_char));
if (front_grid == NULL)
front_grid = ext_mem_alloc(rows * cols * sizeof(struct gterm_char));
background = _background;
if (background)

4
stage23/menu.c
View File

@ -362,7 +362,11 @@ char *menu(char **cmdline) {
}
// If there is GRAPHICS config key and the value is "yes", enable graphics
#if defined (bios)
char *graphics = config_get_value(NULL, 0, "GRAPHICS");
#elif defined (uefi)
char *graphics = "yes";
#endif
if (graphics != NULL && !strcmp(graphics, "yes")) {
// default scheme
int margin = 64;