Skip to content

Commit

Permalink
Merge branch 'locate-handler-buffer' into 'master'
Browse files Browse the repository at this point in the history
Update LocateHandle,LocateHandleBuffer

Closes #1

See merge request redox-os/uefi!21
  • Loading branch information
jackpot51 committed Jan 3, 2025
2 parents ba2813f + 2e821c6 commit 51ab838
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions crates/uefi/src/boot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ pub struct BootServices {
RegisterProtocolNotify: extern "efiapi" fn(),
pub LocateHandle: extern "efiapi" fn(
SearchType: LocateSearchType,
Protocol: &Guid,
SearchKey: usize,
Protocol: *const Guid,
SearchKey: *const usize,
BufferSize: &mut usize,
Buffer: *mut Handle,
) -> Status,
Expand Down Expand Up @@ -113,13 +113,13 @@ pub struct BootServices {
ProtocolBuffer: *mut Guid,
ProtocolBufferCount: usize,
) -> Status,
LocateHandleBuffer: extern "efiapi" fn(
pub LocateHandleBuffer: extern "efiapi" fn(
SearchType: LocateSearchType,
Protocol: &Guid,
SearchKey: usize,
Protocol: *const Guid,
SearchKey: *const usize,
NoHandles: &mut usize,
Buffer: &mut *mut Handle,
),
) -> Status,
pub LocateProtocol:
extern "efiapi" fn(Protocol: &Guid, Registration: usize, Interface: &mut usize) -> Status,
InstallMultipleProtocolInterfaces: extern "efiapi" fn(),
Expand Down
2 changes: 1 addition & 1 deletion crates/uefi_std/src/proto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub trait Protocol<T: 'static> {
let status = (system_table().BootServices.LocateHandle)(
LocateSearchType::ByProtocol,
&guid,
0,
core::ptr::null(),
&mut len,
handles.as_mut_ptr(),
);
Expand Down

0 comments on commit 51ab838

Please sign in to comment.