1 files changed, 14 insertions, 12 deletions

diff --git a/rsnix/src/gop.rs b/rsnix/src/gop.rs
index 77cc514..0d24d7d 100644
--- a/rsnix/src/gop.rs
+++ b/rsnix/src/gop.rs
@@ -105,23 +105,25 @@ pub fn clear_screen() {
     crate::vt::clear_all();
 }
 
+/// Raw-pointer accessor for the framebuffer static (single-threaded
+/// kernel; keeps `static_mut_refs` quiet).
+fn fb() -> &'static mut Option<Framebuffer> {
+    unsafe { &mut *core::ptr::addr_of_mut!(FB) }
+}
+
 /// (cols, rows) of the text surface, from the current framebuffer mode.
 pub fn dims() -> (usize, usize) {
-    unsafe {
-        match FB.as_ref() {
-            Some(f) => (f.width / 8, f.height / 16),
-            None => (0, 0),
-        }
+    match fb().as_ref() {
+        Some(f) => (f.width / 8, f.height / 16),
+        None => (0, 0),
     }
 }
 
 /// Pack an (r, g, b) colour for the framebuffer's pixel format.
 pub fn rgb(r: u8, g: u8, b: u8) -> u32 {
-    unsafe {
-        match FB.as_ref() {
-            Some(f) if f.bgr => ((r as u32) << 16) | ((g as u32) << 8) | b as u32,
-            _ => ((b as u32) << 16) | ((g as u32) << 8) | r as u32,
-        }
+    match fb().as_ref() {
+        Some(f) if f.bgr => ((r as u32) << 16) | ((g as u32) << 8) | b as u32,
+        _ => ((b as u32) << 16) | ((g as u32) << 8) | r as u32,
     }
 }
 
@@ -340,7 +342,7 @@ fn unicode_glyph_bits(ch: u16) -> Option<[u8; 16]> {
 }
 
 pub(crate) fn blit_glyph(col: usize, row: usize, ch: u16, fg: (u8, u8, u8), bg: (u8, u8, u8)) {
-    if let Some(fb) = unsafe { FB.as_ref() } {
+    if let Some(fb) = fb().as_ref() {
         let glyph = font::GLYPH_8X16;
         let data = if ch < 256 {
             match glyph.get(ch as usize) {
@@ -381,7 +383,7 @@ pub(crate) fn blit_glyph(col: usize, row: usize, ch: u16, fg: (u8, u8, u8), bg:
 /// Shift the framebuffer content up `n` text rows and clear the exposed
 /// bottom rows.  `n` batches deferred scrolls into one push.
 pub(crate) fn shift_up_n(n: usize) {
-    if let Some(fb) = unsafe { FB.as_ref() } {
+    if let Some(fb) = fb().as_ref() {
         fb.shift_up_n(n);
     }
 }