1 files changed, 12 insertions, 14 deletions

diff --git a/rsdos/src/main.rs b/rsdos/src/main.rs
index e6b7d2a..2ba5d32 100644
--- a/rsdos/src/main.rs
+++ b/rsdos/src/main.rs
@@ -1,6 +1,6 @@
 #![no_std]
 #![no_main]
-#![allow(static_mut_refs, unsafe_code)]
+#![allow(unsafe_code)]
 
 use core::panic::PanicInfo;
 use rsnix::uefi::*;
@@ -31,8 +31,15 @@ fn panic(info: &PanicInfo) -> ! {
 // ---------------------------------------------------------------------------
 // EFI entry point
 // ---------------------------------------------------------------------------
+/// EFI entry point.
+///
+/// # Safety
+///
+/// The firmware hands us raw pointers (image handle, system table) that
+/// must remain valid for the lifetime of the call — a contract guaranteed
+/// by the UEFI loader.
 #[no_mangle]
-pub extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut SystemTable) -> ! {
+pub unsafe extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut SystemTable) -> ! {
     let st = unsafe { &mut *system_table };
     let bs = unsafe { &mut *st.boot_services };
     let con_out = unsafe { &mut *st.con_out };
@@ -83,22 +90,13 @@ pub extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut SystemT
         rsnix::serial_println!("gop: not found (0x{:x})", gop_result);
     }
     rsnix::vt::init();
-    rsnix::serial_println!(
-        "vt: terminal ready ({}x{})",
-        {
-            let (rows, cols) = rsnix::vt::size();
-            rows
-        },
-        {
-            let (rows, cols) = rsnix::vt::size();
-            cols
-        }
-    );
+    let (rows, cols) = rsnix::vt::size();
+    rsnix::serial_println!("vt: terminal ready ({}x{})", rows, cols);
 
     // ExitBootServices — we now own the machine
     if unsafe { (bs.exit_boot_services)(image_handle, map_key) } != EFI_SUCCESS {
         rsnix::serial_println!("WARN: ExitBootServices failed, retrying...");
-        match rsnix::memory::refresh_and_exit(bs, image_handle) {
+        match unsafe { rsnix::memory::refresh_and_exit(bs, image_handle) } {
             Ok(_) => {}
             Err(e) => {
                 rsnix::serial_println!("FATAL: cannot ExitBootServices (0x{:x})", e);