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

limine: Do not panic if failing to set up terminal or framebuffer

This commit is contained in:
mintsuki 2022-10-05 14:22:29 +02:00
parent 194e60a3ba
commit 10df010029
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/protos/limine.c
View File

@ -692,13 +692,20 @@ FEAT_START
char *term_conf_override_s = config_get_value(config, 0, "TERM_CONFIG_OVERRIDE");
if (term_conf_override_s != NULL && strcmp(term_conf_override_s, "yes") == 0) {
gterm_init(config, req_width, req_height);
if (!gterm_init(config, req_width, req_height)) {
goto term_fail;
}
} else {
gterm_init(NULL, req_width, req_height);
if (!gterm_init(NULL, req_width, req_height)) {
goto term_fail;
}
}
if (term == NULL) {
panic(true, "limine: Failed to initialise terminal");
if (0) {
term_fail:
pmm_free(terminal, sizeof(struct limine_terminal));
pmm_free(terminal_response, sizeof(struct limine_terminal_response));
break; // next feature
}
fb = fbinfo;
@ -751,7 +758,7 @@ FEAT_END
term = NULL;
if (!fb_init(&fb, req_width, req_height, req_bpp)) {
panic(true, "limine: Could not acquire framebuffer");
goto no_fb;
}
skip_fb_init:
@ -804,6 +811,7 @@ FEAT_START
framebuffer_request->response = reported_addr(framebuffer_response);
FEAT_END
no_fb:
// Boot time feature
FEAT_START
struct limine_boot_time_request *boot_time_request = get_request(LIMINE_BOOT_TIME_REQUEST);