Merge pull request #351 from hermit-os/dependabot/cargo/uefi-0.29.0

build(deps): bump uefi from 0.28.0 to 0.29.0

Cargo.toml

@@ -35,7 +35,7 @@ hermit-dtb = { version = "0.1" }
 goblin = { version = "0.8", default-features = false, features = ["elf64"] }
 
 [target.'cfg(target_os = "uefi")'.dependencies]
-uefi = { version = "0.28", features = ["alloc", "panic_handler", "qemu"] }
+uefi = { version = "0.29", features = ["alloc", "panic_handler", "qemu"] }
 qemu-exit = "3"
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]

src/os/uefi/console.rs

@@ -29,7 +29,8 @@ impl Console {
 	fn init(&mut self) {
 		assert!(matches!(self, Console::None));
 		unsafe {
-			uefi::helpers::system_table()
+			uefi::table::system_table_boot()
+				.unwrap()
 				.boot_services()
 				.create_event(
 					EventType::SIGNAL_EXIT_BOOT_SERVICES,
@@ -50,7 +51,10 @@ impl fmt::Write for Console {
 				self.init();
 				self.write_str(s)?;
 			}
-			Console::BootServices => uefi::helpers::system_table().stdout().write_str(s)?,
+			Console::BootServices => uefi::table::system_table_boot()
+				.unwrap()
+				.stdout()
+				.write_str(s)?,
 			Console::Native { console } => console.write_bytes(s.as_bytes()),
 		}
 		Ok(())

src/os/uefi/mod.rs

@@ -28,7 +28,7 @@ fn loader_main(_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
 
 	allocator::exit_boot_services();
 	let (_runtime_system_table, _memory_map) =
-		system_table.exit_boot_services(MemoryType::LOADER_DATA);
+		unsafe { system_table.exit_boot_services(MemoryType::LOADER_DATA) };
 
 	println!("Exited boot services!");
 	println!("Allocations still {}!", String::from("work"));