chore(deps): update uefi

YatSenOS · May 1, 2024 · 2eb4c17 · 2eb4c17
1 parent f42f8ab
commit 2eb4c17
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/docs/labs/0x00/tasks.md b/docs/labs/0x00/tasks.md
@@ -293,7 +293,7 @@ targets = [ "x86_64-unknown-uefi" ]
 
     ```json
     {
-        "rust-analyzer.cargo.target": "x86_64-unknown-uefi"
+        "rust-analyzer.cargo.target": "x86_64-unknown-none"
     }
     ```
 
@@ -341,7 +341,7 @@ use uefi::prelude::*;
 
 #[entry]
 fn efi_main(image: uefi::Handle, mut system_table: SystemTable<Boot>) -> Status {
-    uefi_services::init(&mut system_table).expect("Failed to initialize utilities");
+    uefi::helpers::init(&mut system_table).expect("Failed to initialize utilities");
     log::set_max_level(log::LevelFilter::Info);
 
     let std_num = /* FIXME */;

diff --git a/src/0x00/pkg/boot/Cargo.toml b/src/0x00/pkg/boot/Cargo.toml
@@ -5,6 +5,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uefi = "0.27"
-uefi-services = { version = "0.24" }
+uefi = { version = "0.28", default-features = false }
 log = "0.4"
+
+[features]
+boot = ["uefi/alloc", "uefi/logger", "uefi/panic_handler", "uefi/global_allocator"]
+default = ["boot"]
diff --git a/src/0x01/pkg/boot/Cargo.toml b/src/0x01/pkg/boot/Cargo.toml
@@ -6,13 +6,13 @@ edition = "2021"
 
 [dependencies]
 arrayvec = { version = "0.7", default-features = false }
-uefi = "0.27"
-uefi-services = { version = "0.24", optional = true }
+uefi = { version = "0.28", default-features = false }
 log = "0.4"
 x86_64 = "0.15"
 xmas-elf = "0.9"
 elf = { package = "ysos_elf", path = "../elf" }
 
 [features]
-boot = ["uefi/alloc", "uefi-services"]
+boot = ["uefi/alloc", "uefi/logger", "uefi/panic_handler", "uefi/global_allocator"]
 default = ["boot"]
+
diff --git a/src/0x01/pkg/boot/src/main.rs b/src/0x01/pkg/boot/src/main.rs
@@ -18,7 +18,7 @@ const CONFIG_PATH: &str = "\\EFI\\BOOT\\boot.conf";
 
 #[entry]
 fn efi_main(image: uefi::Handle, mut system_table: SystemTable<Boot>) -> Status {
-    uefi_services::init(&mut system_table).expect("Failed to initialize utilities");
+    uefi::helpers::init(&mut system_table).expect("Failed to initialize utilities");
 
     log::set_max_level(log::LevelFilter::Info);
     info!("Running UEFI bootloader...");