Skip to content

Change Event to be FFI-safe using NonNull #507

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
nicholasbishop merged 5 commits into from
Oct 17, 2022
Merged

Change Event to be FFI-safe using NonNull #507

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9833ee1
Change `Event` to be FFI-safe using `NonNull`
timrobertsdev Sep 7, 2022
0f0aeea
Merge branch 'rust-osdev:main' into nonnull-event
timrobertsdev Sep 14, 2022
c64b284
Merge branch 'main' into nonnull-event
timrobertsdev Oct 13, 2022
44db75e
Add `Event` change to changelog.
timrobertsdev Oct 13, 2022
19ecdb3
Cargo fmt for whitespace
timrobertsdev Oct 17, 2022
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
2 changes: 1 addition & 1 deletion src/data_types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ impl Handle {

/// Handle to an event structure
#[repr(transparent)]
pub struct Event(*mut c_void);
pub struct Event(NonNull<c_void>);

impl Event {
/// Clone this `Event`
Expand Down
2 changes: 1 addition & 1 deletion src/proto/media/disk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl DiskIo {
#[repr(C)]
pub struct DiskIo2Token {
/// Event to be signalled when an asynchronous disk I/O operation completes.
pub event: Event,
pub event: Option<Event>,
/// Transaction status code.
pub transaction_status: Status,
}
Expand Down
2 changes: 1 addition & 1 deletion uefi-test-runner/src/proto/media/known_disk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ fn test_raw_disk_io2(handle: Handle, bt: &BootServices) {
// Initialise the task context
let mut task = DiskIoTask {
token: DiskIo2Token {
event: event.unsafe_clone(),
event: Some(event.unsafe_clone()),
transaction_status: uefi::Status::NOT_READY,
},
buffer: [0; 512],
Expand Down