mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

std: uefi: Use common function for UEFI shell

Browse Source 
- Since in almost all cases, there will only be 1 UEFI shell, share the
  shell handle between all functions that require it.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
This commit is contained in:
Ayush Singh 2024-10-16 09:10:54 +05:30
parent 588bfb4d50
commit 753536aba8
No known key found for this signature in database
GPG Key ID: 05CEF5C789E55A74
1 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/std/src/sys/pal/uefi/os.rs
View File

@ -125,7 +125,7 @@ pub fn error_string(errno: RawOsError) -> String {
} }
pub fn getcwd() -> io::Result<PathBuf> { pub fn getcwd() -> io::Result<PathBuf> {
match uefi_shell::open_shell() { match helpers::open_shell() {
Some(shell) => { Some(shell) => {
// SAFETY: path_ptr is managed by UEFI shell and should not be deallocated // SAFETY: path_ptr is managed by UEFI shell and should not be deallocated
let path_ptr = unsafe { ((*shell.as_ptr()).get_cur_dir)(crate::ptr::null_mut()) }; let path_ptr = unsafe { ((*shell.as_ptr()).get_cur_dir)(crate::ptr::null_mut()) };
@ -144,7 +144,7 @@ pub fn getcwd() -> io::Result<PathBuf> {
} }
pub fn chdir(p: &path::Path) -> io::Result<()> { pub fn chdir(p: &path::Path) -> io::Result<()> {
let shell = uefi_shell::open_shell().ok_or(unsupported_err())?; let shell = helpers::open_shell().ok_or(unsupported_err())?;
let mut p = helpers::os_string_to_raw(p.as_os_str()) let mut p = helpers::os_string_to_raw(p.as_os_str())
.ok_or(io::const_io_error!(io::ErrorKind::InvalidData, "Invalid path"))?; .ok_or(io::const_io_error!(io::ErrorKind::InvalidData, "Invalid path"))?;
@ -275,40 +275,6 @@ pub fn getpid() -> u32 {
panic!("no pids on this platform") panic!("no pids on this platform")
} }
mod uefi_shell {
use r_efi::protocols::shell;
use super::super::helpers;
use crate::ptr::NonNull;
use crate::sync::atomic::{AtomicPtr, Ordering};
pub fn open_shell() -> Option<NonNull<shell::Protocol>> {
static LAST_VALID_HANDLE: AtomicPtr<crate::ffi::c_void> =
AtomicPtr::new(crate::ptr::null_mut());
if let Some(handle) = NonNull::new(LAST_VALID_HANDLE.load(Ordering::Acquire)) {
if let Ok(protocol) = helpers::open_protocol::<shell::Protocol>(
handle,
r_efi::protocols::shell::PROTOCOL_GUID,
) {
return Some(protocol);
}
}
let handles = helpers::locate_handles(shell::PROTOCOL_GUID).ok()?;
for handle in handles {
if let Ok(protocol) =
helpers::open_protocol::<shell::Protocol>(handle, shell::PROTOCOL_GUID)
{
LAST_VALID_HANDLE.store(handle.as_ptr(), Ordering::Release);
return Some(protocol);
}
}
None
}
}
mod uefi_env { mod uefi_env {
use crate::ffi::{OsStr, OsString}; use crate::ffi::{OsStr, OsString};
use crate::io; use crate::io;