mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-30 01:53:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12897 from r00ster91/uefi

Browse Source 
std.os.uefi: fix some mistakes
This commit is contained in:
Andrew Kelley 2022-10-12 05:28:13 -04:00 committed by GitHub
commit d08191e146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/std/os/uefi/protocols/managed_network_protocol.zig
View File

@ -15,7 +15,7 @@ pub const ManagedNetworkProtocol = extern struct {
_transmit: std.meta.FnPtr(fn (*const ManagedNetworkProtocol, *const ManagedNetworkCompletionToken) callconv(.C) Status),
_receive: std.meta.FnPtr(fn (*const ManagedNetworkProtocol, *const ManagedNetworkCompletionToken) callconv(.C) Status),
_cancel: std.meta.FnPtr(fn (*const ManagedNetworkProtocol, ?*const ManagedNetworkCompletionToken) callconv(.C) Status),
_poll: std.meta.FnPtr(fn (*const ManagedNetworkProtocol) callconv(.C) usize),
_poll: std.meta.FnPtr(fn (*const ManagedNetworkProtocol) callconv(.C) Status),
/// Returns the operational parameters for the current MNP child driver.
/// May also support returning the underlying SNP driver mode data.
@ -31,8 +31,7 @@ pub const ManagedNetworkProtocol = extern struct {
/// Translates an IP multicast address to a hardware (MAC) multicast address.
/// This function may be unsupported in some MNP implementations.
pub fn mcastIpToMac(self: *const ManagedNetworkProtocol, ipv6flag: bool, ipaddress: *const anyopaque, mac_address: *MacAddress) Status {
_ = mac_address;
return self._mcast_ip_to_mac(self, ipv6flag, ipaddress);
return self._mcast_ip_to_mac(self, ipv6flag, ipaddress, mac_address);
}
/// Enables and disables receive filters for multicast address.

4
lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig
View File

@ -10,7 +10,7 @@ pub const SimpleTextInputExProtocol = extern struct {
_read_key_stroke_ex: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *KeyData) callconv(.C) Status),
wait_for_key_ex: Event,
_set_state: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const u8) callconv(.C) Status),
_register_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const KeyData, fn (*const KeyData) callconv(.C) usize, **anyopaque) callconv(.C) Status),
_register_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const KeyData, std.meta.FnPtr(fn (*const KeyData) callconv(.C) usize), **anyopaque) callconv(.C) Status),
_unregister_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const anyopaque) callconv(.C) Status),
/// Resets the input device hardware.
@ -29,7 +29,7 @@ pub const SimpleTextInputExProtocol = extern struct {
}
/// Register a notification function for a particular keystroke for the input device.
pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: fn (*const KeyData) callconv(.C) usize, handle: **anyopaque) Status {
pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: std.meta.FnPtr(fn (*const KeyData) callconv(.C) usize), handle: **anyopaque) Status {
return self._register_key_notify(self, key_data, notify, handle);
}

2
lib/std/os/uefi/tables/boot_services.zig
View File

@ -191,7 +191,7 @@ pub const BootServices = extern struct {
pub const tpl_high_level: usize = 31;
};
pub const EfiEventNotify = fn (event: Event, ctx: *anyopaque) callconv(.C) void;
pub const EfiEventNotify = std.meta.FnPtr(fn (event: Event, ctx: *anyopaque) callconv(.C) void);
pub const TimerDelay = enum(u32) {
TimerCancel,