Skip to content

Use const interface pointers in protocol management functions #981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2023
Merged

Use const interface pointers in protocol management functions #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@
`Logger::set_output` to enable it.
- `uefi::allocator::init` now takes a `&mut SystemTable<Boot>` instead of
`&BootServices`.
- `BootServices::{install,reinstall,uninstall}_protocol_interface` now take
`const` interface pointers.

## uefi-macros - [Unreleased]

## uefi-raw - [Unreleased]

### Changed
- `{install,reinstall,uninstall}_protocol_interface` now take `const` interface pointers.

## uefi-services - [Unreleased]

### Changed
Expand Down
8 changes: 4 additions & 4 deletions uefi-raw/src/table/boot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,18 @@ pub struct BootServices {
handle: *mut Handle,
guid: *const Guid,
interface_type: InterfaceType,
interface: *mut c_void,
interface: *const c_void,
) -> Status,
pub reinstall_protocol_interface: unsafe extern "efiapi" fn(
handle: Handle,
protocol: *const Guid,
old_interface: *mut c_void,
new_interface: *mut c_void,
old_interface: *const c_void,
new_interface: *const c_void,
) -> Status,
pub uninstall_protocol_interface: unsafe extern "efiapi" fn(
handle: Handle,
protocol: *const Guid,
interface: *mut c_void,
interface: *const c_void,
) -> Status,
pub handle_protocol: unsafe extern "efiapi" fn(
handle: Handle,
Expand Down
8 changes: 4 additions & 4 deletions uefi/src/table/boot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ impl BootServices {
&self,
handle: Option<Handle>,
protocol: &Guid,
interface: *mut c_void,
interface: *const c_void,
) -> Result<Handle> {
let mut handle = Handle::opt_to_ptr(handle);
((self.0.install_protocol_interface)(
Expand Down Expand Up @@ -594,8 +594,8 @@ impl BootServices {
&self,
handle: Handle,
protocol: &Guid,
old_interface: *mut c_void,
new_interface: *mut c_void,
old_interface: *const c_void,
new_interface: *const c_void,
) -> Result<()> {
(self.0.reinstall_protocol_interface)(
handle.as_ptr(),
Expand Down Expand Up @@ -629,7 +629,7 @@ impl BootServices {
&self,
handle: Handle,
protocol: &Guid,
interface: *mut c_void,
interface: *const c_void,
) -> Result<()> {
(self.0.uninstall_protocol_interface)(handle.as_ptr(), protocol, interface).to_result()
}
Expand Down