zig

commit d08191e146a63d8f9de15f33f92a992f96d021c0 (tree)
parent 7ce1ee1bce4d9ca05a647c9c390c6525be0b6362
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed, 12 Oct 2022 05:28:13 -0400

Merge pull request #12897 from r00ster91/uefi

std.os.uefi: fix some mistakes
Diffstat:
M
lib/std/os/uefi/protocols/managed_network_protocol.zig
 | 
5
++---
M
lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig
 | 
4
++--
M
lib/std/os/uefi/tables/boot_services.zig
 | 
2
+-

3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/std/os/uefi/protocols/managed_network_protocol.zig b/lib/std/os/uefi/protocols/managed_network_protocol.zig
@@ -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.
diff --git a/lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig b/lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig
@@ -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);
     }
 
diff --git a/lib/std/os/uefi/tables/boot_services.zig b/lib/std/os/uefi/tables/boot_services.zig
@@ -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,