Merge pull request #1358 from nicholasbishop/bishop-update-logger

uefi: Update logger to use the global system table

Author: phip1611

uefi/src/helpers/logger.rs

@@ -12,8 +12,8 @@
 //! The last part also means that some Unicode characters might not be
 //! supported by the UEFI console. Don't expect emoji output support.
 
-use crate::prelude::{Boot, SystemTable};
 use crate::proto::console::text::Output;
+use crate::system;
 use core::fmt::{self, Write};
 use core::ptr;
 use core::sync::atomic::{AtomicPtr, Ordering};
@@ -25,9 +25,11 @@ static LOGGER: Logger = Logger::new();
 ///
 /// This is unsafe because you must arrange for the logger to be reset with
 /// disable() on exit from UEFI boot services.
-pub unsafe fn init(st: &mut SystemTable<Boot>) {
+pub unsafe fn init() {
     // Connect the logger to stdout.
-    LOGGER.set_output(st.stdout());
+    system::with_stdout(|stdout| {
+        LOGGER.set_output(stdout);
+    });
 
     // Set the logger.
     log::set_logger(&LOGGER).unwrap(); // Can only fail if already initialized.

uefi/src/helpers/mod.rs

@@ -58,8 +58,7 @@ pub fn init() -> Result<()> {
     // Set up logging.
     #[cfg(feature = "logger")]
     unsafe {
-        let mut st = table::system_table_boot().expect("boot services are not active");
-        logger::init(&mut st);
+        logger::init();
     }
 
     Ok(())