Merge pull request #1350 from nicholasbishop/bishop-rename-entry-args

uefi-macros: Rename generated entry arguments
rust-osdev · Aug 25, 2024 · 26d3b74 · 26d3b74
2 parents 7bd40b9 + c135e6c
commit 26d3b74
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/uefi-macros/src/lib.rs b/uefi-macros/src/lib.rs
@@ -203,8 +203,8 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream {
     if f.sig.inputs.is_empty() {
         f.sig.inputs = parse_quote_spanned!(
             signature_span=>
-                image_handle: ::uefi::Handle,
-                system_table: ::uefi::table::SystemTable<::uefi::table::Boot>
+                internal_image_handle: ::uefi::Handle,
+                internal_system_table: ::uefi::table::SystemTable<::uefi::table::Boot>
         );
     }
 

diff --git a/uefi-test-runner/examples/hello_world.rs b/uefi-test-runner/examples/hello_world.rs
@@ -6,6 +6,7 @@
 
 // ANCHOR: use
 use log::info;
+use uefi::boot;
 use uefi::prelude::*;
 // ANCHOR_END: use
 
@@ -18,7 +19,7 @@ fn main() -> Status {
     // ANCHOR_END: services
     // ANCHOR: log
     info!("Hello world!");
-    system_table.boot_services().stall(10_000_000);
+    boot::stall(10_000_000);
     // ANCHOR_END: log
     // ANCHOR: return
     Status::SUCCESS

diff --git a/uefi-test-runner/examples/shell_params.rs b/uefi-test-runner/examples/shell_params.rs
@@ -7,8 +7,8 @@
 use log::error;
 // ANCHOR: use
 use uefi::prelude::*;
-use uefi::println;
 use uefi::proto::shell_params::ShellParameters;
+use uefi::{boot, println};
 
 extern crate alloc;
 use alloc::string::{String, ToString};
@@ -21,12 +21,11 @@ fn main() -> Status {
     // ANCHOR_END: entry
     // ANCHOR: services
     uefi::helpers::init().unwrap();
-    let boot_services = system_table.boot_services();
     // ANCHOR_END: services
 
     // ANCHOR: params
     let shell_params =
-        boot_services.open_protocol_exclusive::<ShellParameters>(image_handle);
+        boot::open_protocol_exclusive::<ShellParameters>(boot::image_handle());
     let shell_params = match shell_params {
         Ok(s) => s,
         Err(e) => {