Commit 403c99e

NathanRoyernicholasbishop

authored and

committed

Allow uefi-services to work when the "logger" feature is disabled in uefi

1 parent c430f08 commit 403c99eCopy full SHA for 403c99e

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,14 @@ is-it-maintained-issue-resolution = { repository = "rust-osdev/uefi-rs" }`
`15`	`15`	`is-it-maintained-open-issues = { repository = "rust-osdev/uefi-rs" }`
`16`	`16`
`17`	`17`	`[dependencies]`
`18`		`-uefi = { version = "0.17.0", features = ["alloc", "logger"] }`
	`18`	`+uefi = { version = "0.17.0", features = ["alloc"] }`
`19`	`19`	`log = { version = "0.4.5", default-features = false }`
`20`	`20`	`cfg-if = "1.0.0"`
`21`	`21`	`qemu-exit = { version = "3.0.1", optional = true }`
`22`	`22`
`23`	`23`	`[features]`
`24`		`-default = ["panic_handler"]`
	`24`	`+default = ["panic_handler", "logger"]`
`25`	`25`	`# Enable QEMU-specific functionality`
`26`	`26`	`qemu = ["qemu-exit"]`
`27`	`27`	`panic_handler = []`
	`28`	`+logger = ["uefi/logger"]`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ use uefi::{Event, Result};`
`43`	`43`	`static mut SYSTEM_TABLE: Option<SystemTable<Boot>> = None;`
`44`	`44`
`45`	`45`	`/// Global logger object`
	`46`	`+#[cfg(feature = "logger")]`
`46`	`47`	`static mut LOGGER: Option<uefi::logger::Logger> = None;`
`47`	`48`
`48`	`49`	`/// Obtains a pointer to the system table.`
`@@ -77,7 +78,10 @@ pub fn init(st: &mut SystemTable<Boot>) -> Result {`
`77`	`78`	`SYSTEM_TABLE = Some(st.unsafe_clone());`
`78`	`79`
`79`	`80`	`// Setup logging and memory allocation`
	`81`	`+`
	`82`	`+ #[cfg(feature = "logger")]`
`80`	`83`	`init_logger(st);`
	`84`	`+`
`81`	`85`	`let boot_services = st.boot_services();`
`82`	`86`	`uefi::alloc::init(boot_services);`
`83`	`87`
`@@ -144,6 +148,7 @@ macro_rules! println {`
`144`	`148`	`///`
`145`	`149`	`/// This is unsafe because you must arrange for the logger to be reset with`
`146`	`150`	`/// disable() on exit from UEFI boot services.`
	`151`	`+#[cfg(feature = "logger")]`
`147`	`152`	`unsafe fn init_logger(st: &mut SystemTable<Boot>) {`
`148`	`153`	`let stdout = st.stdout();`
`149`	`154`
`@@ -170,6 +175,8 @@ unsafe extern "efiapi" fn exit_boot_services(_e: Event, _ctx: Option<NonNull<c_v`
`170`	`175`	`//`
`171`	`176`	`// info!("Shutting down the UEFI utility library");`
`172`	`177`	`SYSTEM_TABLE = None;`
	`178`	`+`
	`179`	`+ #[cfg(feature = "logger")]`
`173`	`180`	`if let Some(ref mut logger) = LOGGER {`
`174`	`181`	`logger.disable();`
`175`	`182`	`}`

Comments

(0)