Merge pull request #7 from Roeegg2/main

Fix framebuffer compilation feature

Author: Roeegg2

README.md

@@ -1,4 +1,4 @@
-[![GitHub stars](https://img.shields.io/github/stars/roeegg2/funderberker.svg)](https://github.com/funderberker-org/funderberker/stargazers)
+[![GitHub stars](https://img.shields.io/github/stars/funderberker-org/funderberker.svg)](https://github.com/funderberker-org/funderberker/stargazers)
 [![License](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 ![CI Status](https://img.shields.io/github/actions/workflow/status/funderberker-org/funderberker/ci.yaml?logo=github)
 

boot/src/boot/limine.rs

@@ -67,7 +67,7 @@ unsafe extern "C" fn kmain() -> ! {
             .unwrap()
             .framebuffers()
             .next()
-            .as_ref(),
+            .unwrap(),
     );
 
     let hhdm = HHDM_REQUEST

logger/src/framebuffer.rs

@@ -377,12 +377,15 @@ impl FramebufferWriter {
 
 #[inline]
 #[cfg(feature = "limine")]
-pub unsafe fn init_framebuffer_from_limine(fb: &Framebuffer<'static>) {
-    FRAMEBUFFER_WRITER = FramebufferWriter::new(
-        fb.buffer.as_mut_ptr(),
-        fb.width,
-        fb.height,
-        fb.pitch,
-        fb.bpp,
-    );
+pub fn init_from_limine(fb: Framebuffer<'static>) {
+    #[allow(static_mut_refs)]
+    unsafe {
+        FRAMEBUFFER_WRITER = FramebufferWriter::new(
+            fb.addr().cast(),
+            fb.width(),
+            fb.height(),
+            fb.pitch(),
+            fb.bpp(),
+        );
+    }
 }

logger/src/lib.rs

@@ -68,7 +68,7 @@ impl Write for Writer {
             #[cfg(feature = "framebuffer")]
             #[allow(static_mut_refs)]
             unsafe {
-                framebuffer::FRAMEBUFFER_WRITER.draw_char(*byte).unwrap();
+                framebuffer::FRAMEBUFFER_WRITER.draw_char(byte).unwrap();
             };
         }