Merge pull request #334 from hermit-os/rm-uefi-services

build(deps): upgrade uefi to version 0.28

.github/dependabot.yml

@@ -8,10 +8,6 @@ updates:
     schedule:
       interval: "weekly"
       timezone: "Europe/Berlin"
-    groups:
-      uefi:
-        patterns:
-          - "uefi*"
 
   - package-ecosystem: "github-actions"
     directory: "/"

Cargo.toml

@@ -38,8 +38,7 @@ exclusive_cell = "0.1"
 spinning_top = "0.3"
 
 [target.'cfg(target_os = "uefi")'.dependencies]
-uefi = { version = "0.27", features = ["alloc"] }
-uefi-services = { version = "0.24", default-features = false, features = ["panic_handler", "qemu"] }
+uefi = { version = "0.28", features = ["alloc", "global_allocator", "panic_handler", "qemu"] }
 qemu-exit = "3"
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]

src/os/uefi/console.rs

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

src/os/uefi/mod.rs

@@ -13,7 +13,7 @@ pub use self::console::CONSOLE;
 // Entry Point of the Uefi Loader
 #[entry]
 fn loader_main(_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
-	uefi_services::init(&mut system_table).unwrap();
+	uefi::helpers::init(&mut system_table).unwrap();
 	crate::log::init();
 
 	let app = read_app(system_table.boot_services());