authorgravatar for 51252236+xdBronch@users.noreply.github.comxdBronch <51252236+xdBronch@users.noreply.github.com> 2023-08-25 17:07:24-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2023-08-25 21:07:24+00:00
log4403008cabdb0d6cdff5cdadf4311e3d73b38a3f
tree86dde971ea2237bcefb45d95800b728044713e6e
parenta31748b29e2e980ac4bf08cf10ee0d6ece1bd9e7
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

fix compile errors introduced by #16953 (#16955)

5 files changed, 25 insertions(+), 25 deletions(-)

lib/std/os/uefi/protocol/hii_database.zig+9-9
......@@ -6,12 +6,12 @@ const hii = uefi.hii;
66const cc = uefi.cc;
77
88/// Database manager for HII-related data structures.
9pub const HIIDatabase = extern struct {
9pub const HiiDatabase = extern struct {
1010 _new_package_list: Status, // TODO
11 _remove_package_list: *const fn (*const HIIDatabase, hii.Handle) callconv(cc) Status,
12 _update_package_list: *const fn (*const HIIDatabase, hii.Handle, *const hii.PackageList) callconv(cc) Status,
13 _list_package_lists: *const fn (*const HIIDatabase, u8, ?*const Guid, *usize, [*]hii.Handle) callconv(cc) Status,
14 _export_package_lists: *const fn (*const HIIDatabase, ?hii.Handle, *usize, *hii.PackageList) callconv(cc) Status,
11 _remove_package_list: *const fn (*const HiiDatabase, hii.Handle) callconv(cc) Status,
12 _update_package_list: *const fn (*const HiiDatabase, hii.Handle, *const hii.PackageList) callconv(cc) Status,
13 _list_package_lists: *const fn (*const HiiDatabase, u8, ?*const Guid, *usize, [*]hii.Handle) callconv(cc) Status,
14 _export_package_lists: *const fn (*const HiiDatabase, ?hii.Handle, *usize, *hii.PackageList) callconv(cc) Status,
1515 _register_package_notify: Status, // TODO
1616 _unregister_package_notify: Status, // TODO
1717 _find_keyboard_layouts: Status, // TODO
......@@ -20,22 +20,22 @@ pub const HIIDatabase = extern struct {
2020 _get_package_list_handle: Status, // TODO
2121
2222 /// Removes a package list from the HII database.
23 pub fn removePackageList(self: *const HIIDatabase, handle: hii.Handle) Status {
23 pub fn removePackageList(self: *const HiiDatabase, handle: hii.Handle) Status {
2424 return self._remove_package_list(self, handle);
2525 }
2626
2727 /// Update a package list in the HII database.
28 pub fn updatePackageList(self: *const HIIDatabase, handle: hii.Handle, buffer: *const hii.PackageList) Status {
28 pub fn updatePackageList(self: *const HiiDatabase, handle: hii.Handle, buffer: *const hii.PackageList) Status {
2929 return self._update_package_list(self, handle, buffer);
3030 }
3131
3232 /// Determines the handles that are currently active in the database.
33 pub fn listPackageLists(self: *const HIIDatabase, package_type: u8, package_guid: ?*const Guid, buffer_length: *usize, handles: [*]hii.Handle) Status {
33 pub fn listPackageLists(self: *const HiiDatabase, package_type: u8, package_guid: ?*const Guid, buffer_length: *usize, handles: [*]hii.Handle) Status {
3434 return self._list_package_lists(self, package_type, package_guid, buffer_length, handles);
3535 }
3636
3737 /// Exports the contents of one or all package lists in the HII database into a buffer.
38 pub fn exportPackageLists(self: *const HIIDatabase, handle: ?hii.Handle, buffer_size: *usize, buffer: *hii.PackageList) Status {
38 pub fn exportPackageLists(self: *const HiiDatabase, handle: ?hii.Handle, buffer_size: *usize, buffer: *hii.PackageList) Status {
3939 return self._export_package_lists(self, handle, buffer_size, buffer);
4040 }
4141
lib/std/os/uefi/protocol/hii_popup.zig+3-3
......@@ -6,12 +6,12 @@ const hii = uefi.hii;
66const cc = uefi.cc;
77
88/// Display a popup window
9pub const HIIPopup = extern struct {
9pub const HiiPopup = extern struct {
1010 revision: u64,
11 _create_popup: *const fn (*const HIIPopup, PopupStyle, PopupType, hii.HIIHandle, u16, ?*PopupSelection) callconv(cc) Status,
11 _create_popup: *const fn (*const HiiPopup, PopupStyle, PopupType, hii.Handle, u16, ?*PopupSelection) callconv(cc) Status,
1212
1313 /// Displays a popup window.
14 pub fn createPopup(self: *const HIIPopup, style: PopupStyle, popup_type: PopupType, handle: hii.HIIHandle, msg: u16, user_selection: ?*PopupSelection) Status {
14 pub fn createPopup(self: *const HiiPopup, style: PopupStyle, popup_type: PopupType, handle: hii.Handle, msg: u16, user_selection: ?*PopupSelection) Status {
1515 return self._create_popup(self, style, popup_type, handle, msg, user_selection);
1616 }
1717
lib/std/os/uefi/protocol/ip6.zig+5-5
......@@ -3,13 +3,13 @@ const uefi = std.os.uefi;
33const Guid = uefi.Guid;
44const Event = uefi.Event;
55const Status = uefi.Status;
6const MacAddress = uefi.protocol.MacAddress;
7const ManagedNetworkConfigData = uefi.protocol.ManagedNetworkConfigData;
8const SimpleNetworkMode = uefi.protocol.SimpleNetworkMode;
6const MacAddress = uefi.MacAddress;
7const ManagedNetworkConfigData = uefi.protocol.ManagedNetwork.Config;
8const SimpleNetwork = uefi.protocol.SimpleNetwork;
99const cc = uefi.cc;
1010
1111pub const Ip6 = extern struct {
12 _get_mode_data: *const fn (*const Ip6, ?*Mode, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) callconv(cc) Status,
12 _get_mode_data: *const fn (*const Ip6, ?*Mode, ?*ManagedNetworkConfigData, ?*SimpleNetwork) callconv(cc) Status,
1313 _configure: *const fn (*const Ip6, ?*const Config) callconv(cc) Status,
1414 _groups: *const fn (*const Ip6, bool, ?*const Address) callconv(cc) Status,
1515 _routes: *const fn (*const Ip6, bool, ?*const Address, u8, ?*const Address) callconv(cc) Status,
......@@ -20,7 +20,7 @@ pub const Ip6 = extern struct {
2020 _poll: *const fn (*const Ip6) callconv(cc) Status,
2121
2222 /// Gets the current operational settings for this instance of the EFI IPv6 Protocol driver.
23 pub fn getModeData(self: *const Ip6, ip6_mode_data: ?*Mode, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetworkMode) Status {
23 pub fn getModeData(self: *const Ip6, ip6_mode_data: ?*Mode, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetwork) Status {
2424 return self._get_mode_data(self, ip6_mode_data, mnp_config_data, snp_mode_data);
2525 }
2626
lib/std/os/uefi/protocol/managed_network.zig+4-4
......@@ -5,12 +5,12 @@ const Event = uefi.Event;
55const Handle = uefi.Handle;
66const Status = uefi.Status;
77const Time = uefi.Time;
8const SimpleNetworkMode = uefi.protocol.SimpleNetworkMode;
9const MacAddress = uefi.protocol.MacAddress;
8const SimpleNetwork = uefi.protocol.SimpleNetwork;
9const MacAddress = uefi.MacAddress;
1010const cc = uefi.cc;
1111
1212pub const ManagedNetwork = extern struct {
13 _get_mode_data: *const fn (*const ManagedNetwork, ?*Config, ?*SimpleNetworkMode) callconv(cc) Status,
13 _get_mode_data: *const fn (*const ManagedNetwork, ?*Config, ?*SimpleNetwork) callconv(cc) Status,
1414 _configure: *const fn (*const ManagedNetwork, ?*const Config) callconv(cc) Status,
1515 _mcast_ip_to_mac: *const fn (*const ManagedNetwork, bool, *const anyopaque, *MacAddress) callconv(cc) Status,
1616 _groups: *const fn (*const ManagedNetwork, bool, ?*const MacAddress) callconv(cc) Status,
......@@ -21,7 +21,7 @@ pub const ManagedNetwork = extern struct {
2121
2222 /// Returns the operational parameters for the current MNP child driver.
2323 /// May also support returning the underlying SNP driver mode data.
24 pub fn getModeData(self: *const ManagedNetwork, mnp_config_data: ?*Config, snp_mode_data: ?*SimpleNetworkMode) Status {
24 pub fn getModeData(self: *const ManagedNetwork, mnp_config_data: ?*Config, snp_mode_data: ?*SimpleNetwork) Status {
2525 return self._get_mode_data(self, mnp_config_data, snp_mode_data);
2626 }
2727
lib/std/os/uefi/protocol/udp6.zig+4-4
......@@ -5,12 +5,12 @@ const Event = uefi.Event;
55const Status = uefi.Status;
66const Time = uefi.Time;
77const Ip6 = uefi.protocol.Ip6;
8const ManagedNetworkConfigData = uefi.protocol.ManagedNetworkConfigData;
9const SimpleNetworkMode = uefi.protocol.SimpleNetworkMode;
8const ManagedNetworkConfigData = uefi.protocol.ManagedNetwork.Config;
9const SimpleNetwork = uefi.protocol.SimpleNetwork;
1010const cc = uefi.cc;
1111
1212pub const Udp6 = extern struct {
13 _get_mode_data: *const fn (*const Udp6, ?*Config, ?*Ip6.ModeData, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) callconv(cc) Status,
13 _get_mode_data: *const fn (*const Udp6, ?*Config, ?*Ip6.Mode, ?*ManagedNetworkConfigData, ?*SimpleNetwork) callconv(cc) Status,
1414 _configure: *const fn (*const Udp6, ?*const Config) callconv(cc) Status,
1515 _groups: *const fn (*const Udp6, bool, ?*const Ip6.Address) callconv(cc) Status,
1616 _transmit: *const fn (*const Udp6, *CompletionToken) callconv(cc) Status,
......@@ -18,7 +18,7 @@ pub const Udp6 = extern struct {
1818 _cancel: *const fn (*const Udp6, ?*CompletionToken) callconv(cc) Status,
1919 _poll: *const fn (*const Udp6) callconv(cc) Status,
2020
21 pub fn getModeData(self: *const Udp6, udp6_config_data: ?*Config, ip6_mode_data: ?*Ip6.ModeData, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetworkMode) Status {
21 pub fn getModeData(self: *const Udp6, udp6_config_data: ?*Config, ip6_mode_data: ?*Ip6.Mode, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetwork) Status {
2222 return self._get_mode_data(self, udp6_config_data, ip6_mode_data, mnp_config_data, snp_mode_data);
2323 }
2424