:: commit 89a5f4a31b57cdd113e4dc95d7c77838462ebd6c

mintsuki <mintsuki@protonmail.com> — 2024-04-09 15:38

parents: a1ca6f15d4

dependencies: Bump Flanterm

diff --git a/bootstrap b/bootstrap
index c64ef705..555f7d4a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -15,7 +15,7 @@ FREESTANDING_HEADERS_COMMIT_HASH=dd3abd2d7147efc4170dff478d3b7730bed14147
 CC_RUNTIME_COMMIT_HASH=38942e9a0d11af77c5d9fb45794850f7a1565d2b
 LIMINE_EFI_COMMIT_HASH=f49bfc29a344f1bd57a6a99d8c71fcc133cd72c7
 TINF_COMMIT_HASH=57ffa1f1d5e3dde19011b2127bd26d01689b694b
-FLANTERM_COMMIT_HASH=9b51770c7ac99f36da85adeccdd6a5891d60f79b
+FLANTERM_COMMIT_HASH=6c2b331107efbd5044c3162546d80b83f72e075b
 STB_COMMIT_HASH=f4a71b13373436a2866c5d68f8f80ac6f0bc1ffe
 
 AUXFILES="config.guess config.sub install-sh"
diff --git a/common/GNUmakefile b/common/GNUmakefile
index 1088a50f..6de11129 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -60,7 +60,6 @@ override CPPFLAGS_FOR_TARGET := \
 
 $(call MKESCAPE,$(BUILDDIR))/./flanterm/backends/fb.o: override CPPFLAGS_FOR_TARGET += \
     -DFLANTERM_FB_DISABLE_BUMP_ALLOC \
-    -DFLANTERM_FB_SUPPORT_BPP \
     -DFLANTERM_FB_ENABLE_MASKING
 
 ifeq ($(TARGET),bios)
diff --git a/test/limine.c b/test/limine.c
index a614d7bc..e88da1fa 100644
--- a/test/limine.c
+++ b/test/limine.c
@@ -231,17 +231,20 @@ static void limine_main(void) {
 
     struct limine_framebuffer *fb = framebuffer_request.response->framebuffers[0];
 
-    ft_ctx = flanterm_fb_simple_init(
-        fb->address,
-        fb->width,
-        fb->height,
-        fb->pitch,
-        fb->red_mask_size,
-        fb->red_mask_shift,
-        fb->green_mask_size,
-        fb->green_mask_shift,
-        fb->blue_mask_size,
-        fb->blue_mask_shift
+    ft_ctx = flanterm_fb_init(
+        NULL,
+        NULL,
+        fb->address, fb->width, fb->height, fb->pitch,
+        fb->red_mask_size, fb->red_mask_shift,
+        fb->green_mask_size, fb->green_mask_shift,
+        fb->blue_mask_size, fb->blue_mask_shift,
+        NULL,
+        NULL, NULL,
+        NULL, NULL,
+        NULL, NULL,
+        NULL, 0, 0, 1,
+        0, 0,
+        0
     );
 
     uint64_t kernel_slide = (uint64_t)kernel_start - 0xffffffff80000000;
tab: 248 wrap: offon