authorgravatar for kanpura16@gmail.comkanpura <kanpura16@gmail.com> 2026-03-11 18:28:39+09:00
committergravatar for mail@linusgroh.delinus <mail@linusgroh.de> 2026-03-12 15:19:29+01:00
logeff332fd042a4ef556409c7650c6b74da0e30235
tree7a3e10d56e276d41e7524188e26b94718ed1ff10
parent80d84537f7c7002c29a39a429072f59303f7d0f7

std.os.uefi.protocol: do not reference errors via the error set(uefi.Status.Error)

closes #31456

20 files changed, 336 insertions(+), 355 deletions(-)

lib/std/os/uefi/protocol/absolute_pointer.zig+3-4
......@@ -4,7 +4,6 @@ const Event = uefi.Event;
44const Guid = uefi.Guid;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98/// Protocol for touchscreens.
109pub const AbsolutePointer = extern struct {
......@@ -20,7 +19,7 @@ pub const AbsolutePointer = extern struct {
2019 pub fn reset(self: *AbsolutePointer, verify: bool) ResetError!void {
2120 switch (self._reset(self, verify)) {
2221 .success => {},
23 .device_error => return Error.DeviceError,
22 .device_error => return error.DeviceError,
2423 else => |status| return uefi.unexpectedStatus(status),
2524 }
2625 }
......@@ -30,8 +29,8 @@ pub const AbsolutePointer = extern struct {
3029 var state: State = undefined;
3130 switch (self._get_state(self, &state)) {
3231 .success => return state,
33 .not_ready => return Error.NotReady,
34 .device_error => return Error.DeviceError,
32 .not_ready => return error.NotReady,
33 .device_error => return error.DeviceError,
3534 else => |status| return uefi.unexpectedStatus(status),
3635 }
3736 }
lib/std/os/uefi/protocol/block_io.zig+13-14
......@@ -2,7 +2,6 @@ const std = @import("std");
22const uefi = std.os.uefi;
33const Status = uefi.Status;
44const cc = uefi.cc;
5const Error = Status.Error;
65
76pub const BlockIo = extern struct {
87 const Self = @This();
......@@ -39,7 +38,7 @@ pub const BlockIo = extern struct {
3938 pub fn reset(self: *Self, extended_verification: bool) ResetError!void {
4039 switch (self._reset(self, extended_verification)) {
4140 .success => {},
42 .device_error => return Error.DeviceError,
41 .device_error => return error.DeviceError,
4342 else => |status| return uefi.unexpectedStatus(status),
4443 }
4544 }
......@@ -48,10 +47,10 @@ pub const BlockIo = extern struct {
4847 pub fn readBlocks(self: *Self, media_id: u32, lba: u64, buf: []u8) ReadBlocksError!void {
4948 switch (self._read_blocks(self, media_id, lba, buf.len, buf.ptr)) {
5049 .success => {},
51 .device_error => return Error.DeviceError,
52 .no_media => return Error.NoMedia,
53 .bad_buffer_size => return Error.BadBufferSize,
54 .invalid_parameter => return Error.InvalidParameter,
50 .device_error => return error.DeviceError,
51 .no_media => return error.NoMedia,
52 .bad_buffer_size => return error.BadBufferSize,
53 .invalid_parameter => return error.InvalidParameter,
5554 else => |status| return uefi.unexpectedStatus(status),
5655 }
5756 }
......@@ -60,12 +59,12 @@ pub const BlockIo = extern struct {
6059 pub fn writeBlocks(self: *Self, media_id: u32, lba: u64, buf: []const u8) WriteBlocksError!void {
6160 switch (self._write_blocks(self, media_id, lba, buf.len, buf.ptr)) {
6261 .success => {},
63 .write_protected => return Error.WriteProtected,
64 .no_media => return Error.NoMedia,
65 .media_changed => return Error.MediaChanged,
66 .device_error => return Error.DeviceError,
67 .bad_buffer_size => return Error.BadBufferSize,
68 .invalid_parameter => return Error.InvalidParameter,
62 .write_protected => return error.WriteProtected,
63 .no_media => return error.NoMedia,
64 .media_changed => return error.MediaChanged,
65 .device_error => return error.DeviceError,
66 .bad_buffer_size => return error.BadBufferSize,
67 .invalid_parameter => return error.InvalidParameter,
6968 else => |status| return uefi.unexpectedStatus(status),
7069 }
7170 }
......@@ -74,8 +73,8 @@ pub const BlockIo = extern struct {
7473 pub fn flushBlocks(self: *Self) FlushBlocksError!void {
7574 switch (self._flush_blocks(self)) {
7675 .success => {},
77 .device_error => return Error.DeviceError,
78 .no_media => return Error.NoMedia,
76 .device_error => return error.DeviceError,
77 .no_media => return error.NoMedia,
7978 else => |status| return uefi.unexpectedStatus(status),
8079 }
8180 }
lib/std/os/uefi/protocol/edid.zig+1-2
......@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
44const Handle = uefi.Handle;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98/// EDID information for an active video output device
109pub const Active = extern struct {
......@@ -51,7 +50,7 @@ pub const Override = extern struct {
5150 var attributes: Attributes = undefined;
5251 switch (self._get_edid(self, &handle, &attributes, &size, &ptr)) {
5352 .success => {},
54 .unsupported => return Error.Unsupported,
53 .unsupported => return error.Unsupported,
5554 else => |status| return uefi.unexpectedStatus(status),
5655 }
5756
lib/std/os/uefi/protocol/file.zig+47-48
......@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
44const Time = uefi.Time;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98pub const File = extern struct {
109 revision: u64,
......@@ -93,16 +92,16 @@ pub const File = extern struct {
9392 create_attributes,
9493 )) {
9594 .success => return new,
96 .not_found => return Error.NotFound,
97 .no_media => return Error.NoMedia,
98 .media_changed => return Error.MediaChanged,
99 .device_error => return Error.DeviceError,
100 .volume_corrupted => return Error.VolumeCorrupted,
101 .write_protected => return Error.WriteProtected,
102 .access_denied => return Error.AccessDenied,
103 .out_of_resources => return Error.OutOfResources,
104 .volume_full => return Error.VolumeFull,
105 .invalid_parameter => return Error.InvalidParameter,
95 .not_found => return error.NotFound,
96 .no_media => return error.NoMedia,
97 .media_changed => return error.MediaChanged,
98 .device_error => return error.DeviceError,
99 .volume_corrupted => return error.VolumeCorrupted,
100 .write_protected => return error.WriteProtected,
101 .access_denied => return error.AccessDenied,
102 .out_of_resources => return error.OutOfResources,
103 .volume_full => return error.VolumeFull,
104 .invalid_parameter => return error.InvalidParameter,
106105 else => |status| return uefi.unexpectedStatus(status),
107106 }
108107 }
......@@ -130,10 +129,10 @@ pub const File = extern struct {
130129 var size: usize = buffer.len;
131130 switch (self._read(self, &size, buffer.ptr)) {
132131 .success => return size,
133 .no_media => return Error.NoMedia,
134 .device_error => return Error.DeviceError,
135 .volume_corrupted => return Error.VolumeCorrupted,
136 .buffer_too_small => return Error.BufferTooSmall,
132 .no_media => return error.NoMedia,
133 .device_error => return error.DeviceError,
134 .volume_corrupted => return error.VolumeCorrupted,
135 .buffer_too_small => return error.BufferTooSmall,
137136 else => |status| return uefi.unexpectedStatus(status),
138137 }
139138 }
......@@ -142,13 +141,13 @@ pub const File = extern struct {
142141 var size: usize = buffer.len;
143142 switch (self._write(self, &size, buffer.ptr)) {
144143 .success => return size,
145 .unsupported => return Error.Unsupported,
146 .no_media => return Error.NoMedia,
147 .device_error => return Error.DeviceError,
148 .volume_corrupted => return Error.VolumeCorrupted,
149 .write_protected => return Error.WriteProtected,
150 .access_denied => return Error.AccessDenied,
151 .volume_full => return Error.VolumeFull,
144 .unsupported => return error.Unsupported,
145 .no_media => return error.NoMedia,
146 .device_error => return error.DeviceError,
147 .volume_corrupted => return error.VolumeCorrupted,
148 .write_protected => return error.WriteProtected,
149 .access_denied => return error.AccessDenied,
150 .volume_full => return error.VolumeFull,
152151 else => |status| return uefi.unexpectedStatus(status),
153152 }
154153 }
......@@ -157,8 +156,8 @@ pub const File = extern struct {
157156 var position: u64 = undefined;
158157 switch (self._get_position(self, &position)) {
159158 .success => return position,
160 .unsupported => return Error.Unsupported,
161 .device_error => return Error.DeviceError,
159 .unsupported => return error.Unsupported,
160 .device_error => return error.DeviceError,
162161 else => |status| return uefi.unexpectedStatus(status),
163162 }
164163 }
......@@ -166,8 +165,8 @@ pub const File = extern struct {
166165 pub fn setPosition(self: *File, position: u64) SeekError!void {
167166 switch (self._set_position(self, position)) {
168167 .success => {},
169 .unsupported => return Error.Unsupported,
170 .device_error => return Error.DeviceError,
168 .unsupported => return error.Unsupported,
169 .device_error => return error.DeviceError,
171170 else => |status| return uefi.unexpectedStatus(status),
172171 }
173172 }
......@@ -190,10 +189,10 @@ pub const File = extern struct {
190189 var len: usize = 0;
191190 switch (self._get_info(self, &InfoType.guid, &len, null)) {
192191 .success, .buffer_too_small => return len,
193 .unsupported => return Error.Unsupported,
194 .no_media => return Error.NoMedia,
195 .device_error => return Error.DeviceError,
196 .volume_corrupted => return Error.VolumeCorrupted,
192 .unsupported => return error.Unsupported,
193 .no_media => return error.NoMedia,
194 .device_error => return error.DeviceError,
195 .volume_corrupted => return error.VolumeCorrupted,
197196 else => |status| return uefi.unexpectedStatus(status),
198197 }
199198 }
......@@ -216,11 +215,11 @@ pub const File = extern struct {
216215 buffer.ptr,
217216 )) {
218217 .success => return @as(*InfoType, @ptrCast(buffer.ptr)),
219 .buffer_too_small => return Error.BufferTooSmall,
220 .unsupported => return Error.Unsupported,
221 .no_media => return Error.NoMedia,
222 .device_error => return Error.DeviceError,
223 .volume_corrupted => return Error.VolumeCorrupted,
218 .buffer_too_small => return error.BufferTooSmall,
219 .unsupported => return error.Unsupported,
220 .no_media => return error.NoMedia,
221 .device_error => return error.DeviceError,
222 .volume_corrupted => return error.VolumeCorrupted,
224223 else => |status| return uefi.unexpectedStatus(status),
225224 }
226225 }
......@@ -244,14 +243,14 @@ pub const File = extern struct {
244243
245244 switch (self._set_info(self, &InfoType.guid, len, @ptrCast(data))) {
246245 .success => {},
247 .unsupported => return Error.Unsupported,
248 .no_media => return Error.NoMedia,
249 .device_error => return Error.DeviceError,
250 .volume_corrupted => return Error.VolumeCorrupted,
251 .write_protected => return Error.WriteProtected,
252 .access_denied => return Error.AccessDenied,
253 .volume_full => return Error.VolumeFull,
254 .bad_buffer_size => return Error.BadBufferSize,
246 .unsupported => return error.Unsupported,
247 .no_media => return error.NoMedia,
248 .device_error => return error.DeviceError,
249 .volume_corrupted => return error.VolumeCorrupted,
250 .write_protected => return error.WriteProtected,
251 .access_denied => return error.AccessDenied,
252 .volume_full => return error.VolumeFull,
253 .bad_buffer_size => return error.BadBufferSize,
255254 else => |status| return uefi.unexpectedStatus(status),
256255 }
257256 }
......@@ -259,11 +258,11 @@ pub const File = extern struct {
259258 pub fn flush(self: *File) FlushError!void {
260259 switch (self._flush(self)) {
261260 .success => {},
262 .device_error => return Error.DeviceError,
263 .volume_corrupted => return Error.VolumeCorrupted,
264 .write_protected => return Error.WriteProtected,
265 .access_denied => return Error.AccessDenied,
266 .volume_full => return Error.VolumeFull,
261 .device_error => return error.DeviceError,
262 .volume_corrupted => return error.VolumeCorrupted,
263 .write_protected => return error.WriteProtected,
264 .access_denied => return error.AccessDenied,
265 .volume_full => return error.VolumeFull,
267266 else => |status| return uefi.unexpectedStatus(status),
268267 }
269268 }
lib/std/os/uefi/protocol/graphics_output.zig+6-7
......@@ -3,7 +3,6 @@ const uefi = std.os.uefi;
33const Guid = uefi.Guid;
44const Status = uefi.Status;
55const cc = uefi.cc;
6const Error = Status.Error;
76
87pub const GraphicsOutput = extern struct {
98 _query_mode: *const fn (*const GraphicsOutput, u32, *usize, **Mode.Info) callconv(cc) Status,
......@@ -30,8 +29,8 @@ pub const GraphicsOutput = extern struct {
3029 var info: *Mode.Info = undefined;
3130 switch (self._query_mode(self, mode_id, &size_of_info, &info)) {
3231 .success => return info,
33 .device_error => return Error.DeviceError,
34 .invalid_parameter => return Error.InvalidParameter,
32 .device_error => return error.DeviceError,
33 .invalid_parameter => return error.InvalidParameter,
3534 else => |status| return uefi.unexpectedStatus(status),
3635 }
3736 }
......@@ -40,8 +39,8 @@ pub const GraphicsOutput = extern struct {
4039 pub fn setMode(self: *GraphicsOutput, mode_id: u32) SetModeError!void {
4140 switch (self._set_mode(self, mode_id)) {
4241 .success => {},
43 .device_error => return Error.DeviceError,
44 .unsupported => return Error.Unsupported,
42 .device_error => return error.DeviceError,
43 .unsupported => return error.Unsupported,
4544 else => |status| return uefi.unexpectedStatus(status),
4645 }
4746 }
......@@ -72,8 +71,8 @@ pub const GraphicsOutput = extern struct {
7271 delta,
7372 )) {
7473 .success => {},
75 .device_error => return Error.DeviceError,
76 .invalid_parameter => return Error.InvalidParameter,
74 .device_error => return error.DeviceError,
75 .invalid_parameter => return error.InvalidParameter,
7776 else => |status| return uefi.unexpectedStatus(status),
7877 }
7978 }
lib/std/os/uefi/protocol/hii_database.zig+11-12
......@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
44const Status = uefi.Status;
55const hii = uefi.hii;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98/// Database manager for HII-related data structures.
109pub const HiiDatabase = extern struct {
......@@ -38,10 +37,10 @@ pub const HiiDatabase = extern struct {
3837 };
3938
4039 /// Removes a package list from the HII database.
41 pub fn removePackageList(self: *HiiDatabase, handle: hii.Handle) !void {
40 pub fn removePackageList(self: *HiiDatabase, handle: hii.Handle) RemovePackageListError!void {
4241 switch (self._remove_package_list(self, handle)) {
4342 .success => {},
44 .not_found => return Error.NotFound,
43 .not_found => return error.NotFound,
4544 else => |status| return uefi.unexpectedStatus(status),
4645 }
4746 }
......@@ -54,9 +53,9 @@ pub const HiiDatabase = extern struct {
5453 ) UpdatePackageListError!void {
5554 switch (self._update_package_list(self, handle, buffer)) {
5655 .success => {},
57 .out_of_resources => return Error.OutOfResources,
58 .invalid_parameter => return Error.InvalidParameter,
59 .not_found => return Error.NotFound,
56 .out_of_resources => return error.OutOfResources,
57 .invalid_parameter => return error.InvalidParameter,
58 .not_found => return error.NotFound,
6059 else => |status| return uefi.unexpectedStatus(status),
6160 }
6261 }
......@@ -77,9 +76,9 @@ pub const HiiDatabase = extern struct {
7776 handles.ptr,
7877 )) {
7978 .success => return handles[0..len],
80 .buffer_too_small => return Error.BufferTooSmall,
81 .invalid_parameter => return Error.InvalidParameter,
82 .not_found => return Error.NotFound,
79 .buffer_too_small => return error.BufferTooSmall,
80 .invalid_parameter => return error.InvalidParameter,
81 .not_found => return error.NotFound,
8382 else => |status| return uefi.unexpectedStatus(status),
8483 }
8584 }
......@@ -93,9 +92,9 @@ pub const HiiDatabase = extern struct {
9392 var len = buffer.len;
9493 switch (self._export_package_lists(self, handle, &len, buffer.ptr)) {
9594 .success => return buffer[0..len],
96 .buffer_too_small => return Error.BufferTooSmall,
97 .invalid_parameter => return Error.InvalidParameter,
98 .not_found => return Error.NotFound,
95 .buffer_too_small => return error.BufferTooSmall,
96 .invalid_parameter => return error.InvalidParameter,
97 .not_found => return error.NotFound,
9998 else => |status| return uefi.unexpectedStatus(status),
10099 }
101100 }
lib/std/os/uefi/protocol/hii_popup.zig+2-3
......@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
44const Status = uefi.Status;
55const hii = uefi.hii;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98/// Display a popup window
109pub const HiiPopup = extern struct {
......@@ -27,8 +26,8 @@ pub const HiiPopup = extern struct {
2726 var res: PopupSelection = undefined;
2827 switch (self._create_popup(self, style, popup_type, handle, msg, &res)) {
2928 .success => return res,
30 .invalid_parameter => return Error.InvalidParameter,
31 .out_of_resources => return Error.OutOfResources,
29 .invalid_parameter => return error.InvalidParameter,
30 .out_of_resources => return error.OutOfResources,
3231 else => |status| return uefi.unexpectedStatus(status),
3332 }
3433 }
lib/std/os/uefi/protocol/ip6.zig+65-66
......@@ -7,7 +7,6 @@ const MacAddress = uefi.MacAddress;
77const ManagedNetworkConfigData = uefi.protocol.ManagedNetwork.Config;
88const SimpleNetwork = uefi.protocol.SimpleNetwork;
99const cc = uefi.cc;
10const Error = Status.Error;
1110
1211pub const Ip6 = extern struct {
1312 _get_mode_data: *const fn (*const Ip6, ?*Mode, ?*ManagedNetworkConfigData, ?*SimpleNetwork) callconv(cc) Status,
......@@ -102,8 +101,8 @@ pub const Ip6 = extern struct {
102101 var data: ModeData = undefined;
103102 switch (self._get_mode_data(self, &data.ip6_mode, &data.mnp_config, &data.snp_mode)) {
104103 .success => return data,
105 .invalid_parameter => return Error.InvalidParameter,
106 .out_of_resources => return Error.OutOfResources,
104 .invalid_parameter => return error.InvalidParameter,
105 .out_of_resources => return error.OutOfResources,
107106 else => |status| return uefi.unexpectedStatus(status),
108107 }
109108 }
......@@ -114,12 +113,12 @@ pub const Ip6 = extern struct {
114113 pub fn configure(self: *Ip6, ip6_config_data: *const Config) ConfigureError!void {
115114 switch (self._configure(self, ip6_config_data)) {
116115 .success => {},
117 .invalid_parameter => return Error.InvalidParameter,
118 .out_of_resources => return Error.OutOfResources,
119 .no_mapping => return Error.NoMapping,
120 .already_started => return Error.AlreadyStarted,
121 .device_error => return Error.DeviceError,
122 .unsupported => return Error.Unsupported,
116 .invalid_parameter => return error.InvalidParameter,
117 .out_of_resources => return error.OutOfResources,
118 .no_mapping => return error.NoMapping,
119 .already_started => return error.AlreadyStarted,
120 .device_error => return error.DeviceError,
121 .unsupported => return error.Unsupported,
123122 else => |status| return uefi.unexpectedStatus(status),
124123 }
125124 }
......@@ -127,12 +126,12 @@ pub const Ip6 = extern struct {
127126 pub fn disable(self: *Ip6) ConfigureError!void {
128127 switch (self._configure(self, null)) {
129128 .success => {},
130 .invalid_parameter => return Error.InvalidParameter,
131 .out_of_resources => return Error.OutOfResources,
132 .no_mapping => return Error.NoMapping,
133 .already_started => return Error.AlreadyStarted,
134 .device_error => return Error.DeviceError,
135 .unsupported => return Error.Unsupported,
129 .invalid_parameter => return error.InvalidParameter,
130 .out_of_resources => return error.OutOfResources,
131 .no_mapping => return error.NoMapping,
132 .already_started => return error.AlreadyStarted,
133 .device_error => return error.DeviceError,
134 .unsupported => return error.Unsupported,
136135 else => |status| return uefi.unexpectedStatus(status),
137136 }
138137 }
......@@ -140,13 +139,13 @@ pub const Ip6 = extern struct {
140139 pub fn leaveAllGroups(self: *Ip6) GroupsError!void {
141140 switch (self._groups(self, false, null)) {
142141 .success => {},
143 .invalid_parameter => return Error.InvalidParameter,
144 .not_started => return Error.NotStarted,
145 .out_of_resources => return Error.OutOfResources,
146 .unsupported => return Error.Unsupported,
147 .already_started => return Error.AlreadyStarted,
148 .not_found => return Error.NotFound,
149 .device_error => return Error.DeviceError,
142 .invalid_parameter => return error.InvalidParameter,
143 .not_started => return error.NotStarted,
144 .out_of_resources => return error.OutOfResources,
145 .unsupported => return error.Unsupported,
146 .already_started => return error.AlreadyStarted,
147 .not_found => return error.NotFound,
148 .device_error => return error.DeviceError,
150149 else => |status| return uefi.unexpectedStatus(status),
151150 }
152151 }
......@@ -166,13 +165,13 @@ pub const Ip6 = extern struct {
166165 group_address,
167166 )) {
168167 .success => {},
169 .invalid_parameter => return Error.InvalidParameter,
170 .not_started => return Error.NotStarted,
171 .out_of_resources => return Error.OutOfResources,
172 .unsupported => return Error.Unsupported,
173 .already_started => return Error.AlreadyStarted,
174 .not_found => return Error.NotFound,
175 .device_error => return Error.DeviceError,
168 .invalid_parameter => return error.InvalidParameter,
169 .not_started => return error.NotStarted,
170 .out_of_resources => return error.OutOfResources,
171 .unsupported => return error.Unsupported,
172 .already_started => return error.AlreadyStarted,
173 .not_found => return error.NotFound,
174 .device_error => return error.DeviceError,
176175 else => |status| return uefi.unexpectedStatus(status),
177176 }
178177 }
......@@ -193,11 +192,11 @@ pub const Ip6 = extern struct {
193192 gateway_address,
194193 )) {
195194 .success => {},
196 .not_started => return Error.NotStarted,
197 .invalid_parameter => return Error.InvalidParameter,
198 .out_of_resources => return Error.OutOfResources,
199 .not_found => return Error.NotFound,
200 .access_denied => return Error.AccessDenied,
195 .not_started => return error.NotStarted,
196 .invalid_parameter => return error.InvalidParameter,
197 .out_of_resources => return error.OutOfResources,
198 .not_found => return error.NotFound,
199 .access_denied => return error.AccessDenied,
201200 else => |status| return uefi.unexpectedStatus(status),
202201 }
203202 }
......@@ -222,11 +221,11 @@ pub const Ip6 = extern struct {
222221 override,
223222 )) {
224223 .success => {},
225 .not_started => return Error.NotStarted,
226 .invalid_parameter => return Error.InvalidParameter,
227 .out_of_resources => return Error.OutOfResources,
228 .not_found => return Error.NotFound,
229 .access_denied => return Error.AccessDenied,
224 .not_started => return error.NotStarted,
225 .invalid_parameter => return error.InvalidParameter,
226 .out_of_resources => return error.OutOfResources,
227 .not_found => return error.NotFound,
228 .access_denied => return error.AccessDenied,
230229 else => |status| return uefi.unexpectedStatus(status),
231230 }
232231 }
......@@ -235,17 +234,17 @@ pub const Ip6 = extern struct {
235234 pub fn transmit(self: *Ip6, token: *CompletionToken) TransmitError!void {
236235 switch (self._transmit(self, token)) {
237236 .success => {},
238 .not_started => return Error.NotStarted,
239 .no_mapping => return Error.NoMapping,
240 .invalid_parameter => return Error.InvalidParameter,
241 .access_denied => return Error.AccessDenied,
242 .not_ready => return Error.NotReady,
243 .not_found => return Error.NotFound,
244 .out_of_resources => return Error.OutOfResources,
245 .buffer_too_small => return Error.BufferTooSmall,
246 .bad_buffer_size => return Error.BadBufferSize,
247 .device_error => return Error.DeviceError,
248 .no_media => return Error.NoMedia,
237 .not_started => return error.NotStarted,
238 .no_mapping => return error.NoMapping,
239 .invalid_parameter => return error.InvalidParameter,
240 .access_denied => return error.AccessDenied,
241 .not_ready => return error.NotReady,
242 .not_found => return error.NotFound,
243 .out_of_resources => return error.OutOfResources,
244 .buffer_too_small => return error.BufferTooSmall,
245 .bad_buffer_size => return error.BadBufferSize,
246 .device_error => return error.DeviceError,
247 .no_media => return error.NoMedia,
249248 else => |status| return uefi.unexpectedStatus(status),
250249 }
251250 }
......@@ -254,14 +253,14 @@ pub const Ip6 = extern struct {
254253 pub fn receive(self: *Ip6, token: *CompletionToken) ReceiveError!void {
255254 switch (self._receive(self, token)) {
256255 .success => {},
257 .not_started => return Error.NotStarted,
258 .no_mapping => return Error.NoMapping,
259 .invalid_parameter => return Error.InvalidParameter,
260 .out_of_resources => return Error.OutOfResources,
261 .device_error => return Error.DeviceError,
262 .access_denied => return Error.AccessDenied,
263 .not_ready => return Error.NotReady,
264 .no_media => return Error.NoMedia,
256 .not_started => return error.NotStarted,
257 .no_mapping => return error.NoMapping,
258 .invalid_parameter => return error.InvalidParameter,
259 .out_of_resources => return error.OutOfResources,
260 .device_error => return error.DeviceError,
261 .access_denied => return error.AccessDenied,
262 .not_ready => return error.NotReady,
263 .no_media => return error.NoMedia,
265264 else => |status| return uefi.unexpectedStatus(status),
266265 }
267266 }
......@@ -270,10 +269,10 @@ pub const Ip6 = extern struct {
270269 pub fn cancel(self: *Ip6, token: ?*CompletionToken) CancelError!void {
271270 switch (self._cancel(self, token)) {
272271 .success => {},
273 .invalid_parameter => return Error.InvalidParameter,
274 .not_started => return Error.NotStarted,
275 .not_found => return Error.NotFound,
276 .device_error => return Error.DeviceError,
272 .invalid_parameter => return error.InvalidParameter,
273 .not_started => return error.NotStarted,
274 .not_found => return error.NotFound,
275 .device_error => return error.DeviceError,
277276 else => |status| return uefi.unexpectedStatus(status),
278277 }
279278 }
......@@ -285,10 +284,10 @@ pub const Ip6 = extern struct {
285284 switch (self._poll(self)) {
286285 .success => return true,
287286 .not_ready => return false,
288 .not_started => return Error.NotStarted,
289 .invalid_parameter => return Error.InvalidParameter,
290 .device_error => return Error.DeviceError,
291 .timeout => return Error.Timeout,
287 .not_started => return error.NotStarted,
288 .invalid_parameter => return error.InvalidParameter,
289 .device_error => return error.DeviceError,
290 .timeout => return error.Timeout,
292291 else => |status| return uefi.unexpectedStatus(status),
293292 }
294293 }
lib/std/os/uefi/protocol/ip6_config.zig+18-19
......@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
44const Event = uefi.Event;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87const MacAddress = uefi.MacAddress;
98const Ip6 = uefi.protocol.Ip6;
109
......@@ -49,14 +48,14 @@ pub const Ip6Config = extern struct {
4948 const data_size = @sizeOf(@TypeOf(payload));
5049 switch (self._set_data(self, data_type, data_size, @ptrCast(payload))) {
5150 .success => {},
52 .invalid_parameter => return Error.InvalidParameter,
53 .write_protected => return Error.WriteProtected,
54 .access_denied => return Error.AccessDenied,
55 .not_ready => return Error.NotReady,
56 .bad_buffer_size => return Error.BadBufferSize,
57 .unsupported => return Error.Unsupported,
58 .out_of_resources => return Error.OutOfResources,
59 .device_error => return Error.DeviceError,
51 .invalid_parameter => return error.InvalidParameter,
52 .write_protected => return error.WriteProtected,
53 .access_denied => return error.AccessDenied,
54 .not_ready => return error.NotReady,
55 .bad_buffer_size => return error.BadBufferSize,
56 .unsupported => return error.Unsupported,
57 .out_of_resources => return error.OutOfResources,
58 .device_error => return error.DeviceError,
6059 else => |status| return uefi.unexpectedStatus(status),
6160 }
6261 }
......@@ -72,10 +71,10 @@ pub const Ip6Config = extern struct {
7271
7372 switch (self._get_data(self, data_type, &payload_size, @ptrCast(&payload))) {
7473 .success => return payload,
75 .invalid_parameter => return Error.InvalidParameter,
76 .buffer_too_small => return Error.BufferTooSmall,
77 .not_ready => return Error.NotReady,
78 .not_found => return Error.NotFound,
74 .invalid_parameter => return error.InvalidParameter,
75 .buffer_too_small => return error.BufferTooSmall,
76 .not_ready => return error.NotReady,
77 .not_found => return error.NotFound,
7978 else => |status| return uefi.unexpectedStatus(status),
8079 }
8180 }
......@@ -87,10 +86,10 @@ pub const Ip6Config = extern struct {
8786 ) RegisterDataNotifyError!void {
8887 switch (self._register_data_notify(self, data_type, event)) {
8988 .success => {},
90 .invalid_parameter => return Error.InvalidParameter,
91 .unsupported => return Error.Unsupported,
92 .out_of_resources => return Error.OutOfResources,
93 .access_denied => return Error.AccessDenied,
89 .invalid_parameter => return error.InvalidParameter,
90 .unsupported => return error.Unsupported,
91 .out_of_resources => return error.OutOfResources,
92 .access_denied => return error.AccessDenied,
9493 else => |status| return uefi.unexpectedStatus(status),
9594 }
9695 }
......@@ -102,8 +101,8 @@ pub const Ip6Config = extern struct {
102101 ) UnregisterDataNotifyError!void {
103102 switch (self._unregister_data_notify(self, data_type, event)) {
104103 .success => {},
105 .invalid_parameter => return Error.InvalidParameter,
106 .not_found => return Error.NotFound,
104 .invalid_parameter => return error.InvalidParameter,
105 .not_found => return error.NotFound,
107106 else => |status| return uefi.unexpectedStatus(status),
108107 }
109108 }
lib/std/os/uefi/protocol/loaded_image.zig+1-2
......@@ -7,7 +7,6 @@ const SystemTable = uefi.tables.SystemTable;
77const MemoryType = uefi.tables.MemoryType;
88const DevicePath = uefi.protocol.DevicePath;
99const cc = uefi.cc;
10const Error = Status.Error;
1110
1211pub const LoadedImage = extern struct {
1312 revision: u32,
......@@ -30,7 +29,7 @@ pub const LoadedImage = extern struct {
3029 pub fn unload(self: *LoadedImage, handle: Handle) UnloadError!void {
3130 switch (self._unload(self, handle)) {
3231 .success => {},
33 .invalid_parameter => return Error.InvalidParameter,
32 .invalid_parameter => return error.InvalidParameter,
3433 else => |status| return uefi.unexpectedStatus(status),
3534 }
3635 }
lib/std/os/uefi/protocol/managed_network.zig+21-21
......@@ -141,13 +141,13 @@ pub const ManagedNetwork = extern struct {
141141 pub fn transmit(self: *ManagedNetwork, token: *CompletionToken) TransmitError!void {
142142 switch (self._transmit(self, token)) {
143143 .success => {},
144 .not_started => return Error.NotStarted,
145 .invalid_parameter => return Error.InvalidParameter,
146 .access_denied => return Error.AccessDenied,
147 .out_of_resources => return Error.OutOfResources,
148 .device_error => return Error.DeviceError,
149 .not_ready => return Error.NotReady,
150 .no_media => return Error.NoMedia,
144 .not_started => return error.NotStarted,
145 .invalid_parameter => return error.InvalidParameter,
146 .access_denied => return error.AccessDenied,
147 .out_of_resources => return error.OutOfResources,
148 .device_error => return error.DeviceError,
149 .not_ready => return error.NotReady,
150 .no_media => return error.NoMedia,
151151 else => |status| return uefi.unexpectedStatus(status),
152152 }
153153 }
......@@ -156,13 +156,13 @@ pub const ManagedNetwork = extern struct {
156156 pub fn receive(self: *ManagedNetwork, token: *CompletionToken) TransmitError!void {
157157 switch (self._receive(self, token)) {
158158 .success => {},
159 .not_started => return Error.NotStarted,
160 .invalid_parameter => return Error.InvalidParameter,
161 .out_of_resources => return Error.OutOfResources,
162 .device_error => return Error.DeviceError,
163 .access_denied => return Error.AccessDenied,
164 .not_ready => return Error.NotReady,
165 .no_media => return Error.NoMedia,
159 .not_started => return error.NotStarted,
160 .invalid_parameter => return error.InvalidParameter,
161 .out_of_resources => return error.OutOfResources,
162 .device_error => return error.DeviceError,
163 .access_denied => return error.AccessDenied,
164 .not_ready => return error.NotReady,
165 .no_media => return error.NoMedia,
166166 else => |status| return uefi.unexpectedStatus(status),
167167 }
168168 }
......@@ -171,9 +171,9 @@ pub const ManagedNetwork = extern struct {
171171 pub fn cancel(self: *ManagedNetwork, token: ?*const CompletionToken) CancelError!void {
172172 switch (self._cancel(self, token)) {
173173 .success => {},
174 .not_started => return Error.NotStarted,
175 .invalid_parameter => return Error.InvalidParameter,
176 .not_found => return Error.NotFound,
174 .not_started => return error.NotStarted,
175 .invalid_parameter => return error.InvalidParameter,
176 .not_found => return error.NotFound,
177177 else => |status| return uefi.unexpectedStatus(status),
178178 }
179179 }
......@@ -182,10 +182,10 @@ pub const ManagedNetwork = extern struct {
182182 pub fn poll(self: *ManagedNetwork) PollError!void {
183183 switch (self._poll(self)) {
184184 .success => {},
185 .not_started => return Error.NotStarted,
186 .device_error => return Error.DeviceError,
187 .not_ready => return Error.NotReady,
188 .timeout => return Error.Timeout,
185 .not_started => return error.NotStarted,
186 .device_error => return error.DeviceError,
187 .not_ready => return error.NotReady,
188 .timeout => return error.Timeout,
189189 else => |status| return uefi.unexpectedStatus(status),
190190 }
191191 }
lib/std/os/uefi/protocol/rng.zig+7-8
......@@ -3,7 +3,6 @@ const uefi = std.os.uefi;
33const Guid = uefi.Guid;
44const Status = uefi.Status;
55const cc = uefi.cc;
6const Error = Status.Error;
76
87/// Random Number Generator protocol
98pub const Rng = extern struct {
......@@ -27,9 +26,9 @@ pub const Rng = extern struct {
2726 var len: usize = list.len;
2827 switch (self._get_info(self, &len, list.ptr)) {
2928 .success => return list[0..len],
30 .unsupported => return Error.Unsupported,
31 .device_error => return Error.DeviceError,
32 .buffer_too_small => return Error.BufferTooSmall,
29 .unsupported => return error.Unsupported,
30 .device_error => return error.DeviceError,
31 .buffer_too_small => return error.BufferTooSmall,
3332 else => |status| return uefi.unexpectedStatus(status),
3433 }
3534 }
......@@ -38,10 +37,10 @@ pub const Rng = extern struct {
3837 pub fn getRNG(self: *const Rng, algo: ?*align(8) const Guid, value: []u8) GetRNGError!void {
3938 switch (self._get_rng(self, algo, value.len, value.ptr)) {
4039 .success => {},
41 .unsupported => return Error.Unsupported,
42 .device_error => return Error.DeviceError,
43 .not_ready => return Error.NotReady,
44 .invalid_parameter => return Error.InvalidParameter,
40 .unsupported => return error.Unsupported,
41 .device_error => return error.DeviceError,
42 .not_ready => return error.NotReady,
43 .invalid_parameter => return error.InvalidParameter,
4544 else => |status| return uefi.unexpectedStatus(status),
4645 }
4746 }
lib/std/os/uefi/protocol/serial_io.zig+10-11
......@@ -3,7 +3,6 @@ const uefi = std.os.uefi;
33const Guid = uefi.Guid;
44const Status = uefi.Status;
55const cc = uefi.cc;
6const Error = Status.Error;
76
87pub const SerialIo = extern struct {
98 revision: u64,
......@@ -39,7 +38,7 @@ pub const SerialIo = extern struct {
3938 pub fn reset(self: *SerialIo) ResetError!void {
4039 switch (self._reset(self)) {
4140 .success => {},
42 .device_error => return Error.DeviceError,
41 .device_error => return error.DeviceError,
4342 else => |status| return uefi.unexpectedStatus(status),
4443 }
4544 }
......@@ -64,8 +63,8 @@ pub const SerialIo = extern struct {
6463 stop_bits,
6564 )) {
6665 .success => {},
67 .invalid_parameter => return Error.InvalidParameter,
68 .device_error => return Error.DeviceError,
66 .invalid_parameter => return error.InvalidParameter,
67 .device_error => return error.DeviceError,
6968 else => |status| return uefi.unexpectedStatus(status),
7069 }
7170 }
......@@ -74,8 +73,8 @@ pub const SerialIo = extern struct {
7473 pub fn setControl(self: *SerialIo, control: u32) SetControlError!void {
7574 switch (self._set_control(self, control)) {
7675 .success => {},
77 .unsupported => return Error.Unsupported,
78 .device_error => return Error.DeviceError,
76 .unsupported => return error.Unsupported,
77 .device_error => return error.DeviceError,
7978 else => |status| return uefi.unexpectedStatus(status),
8079 }
8180 }
......@@ -85,7 +84,7 @@ pub const SerialIo = extern struct {
8584 var control: u32 = undefined;
8685 switch (self._get_control(self, &control)) {
8786 .success => return control,
88 .device_error => return Error.DeviceError,
87 .device_error => return error.DeviceError,
8988 else => |status| return uefi.unexpectedStatus(status),
9089 }
9190 }
......@@ -95,8 +94,8 @@ pub const SerialIo = extern struct {
9594 var len: usize = buffer.len;
9695 switch (self._write(self, &len, buffer.ptr)) {
9796 .success => return len,
98 .device_error => return Error.DeviceError,
99 .timeout => return Error.Timeout,
97 .device_error => return error.DeviceError,
98 .timeout => return error.Timeout,
10099 else => |status| return uefi.unexpectedStatus(status),
101100 }
102101 }
......@@ -106,8 +105,8 @@ pub const SerialIo = extern struct {
106105 var len: usize = buffer.len;
107106 switch (self._read(self, &len, buffer.ptr)) {
108107 .success => return len,
109 .device_error => return Error.DeviceError,
110 .timeout => return Error.Timeout,
108 .device_error => return error.DeviceError,
109 .timeout => return error.Timeout,
111110 else => |status| return uefi.unexpectedStatus(status),
112111 }
113112 }
lib/std/os/uefi/protocol/simple_file_system.zig+7-8
......@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
44const File = uefi.protocol.File;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98pub const SimpleFileSystem = extern struct {
109 revision: u64,
......@@ -24,13 +23,13 @@ pub const SimpleFileSystem = extern struct {
2423 var root: *File = undefined;
2524 switch (self._open_volume(self, &root)) {
2625 .success => return root,
27 .unsupported => return Error.Unsupported,
28 .no_media => return Error.NoMedia,
29 .device_error => return Error.DeviceError,
30 .volume_corrupted => return Error.VolumeCorrupted,
31 .access_denied => return Error.AccessDenied,
32 .out_of_resources => return Error.OutOfResources,
33 .media_changed => return Error.MediaChanged,
26 .unsupported => return error.Unsupported,
27 .no_media => return error.NoMedia,
28 .device_error => return error.DeviceError,
29 .volume_corrupted => return error.VolumeCorrupted,
30 .access_denied => return error.AccessDenied,
31 .out_of_resources => return error.OutOfResources,
32 .media_changed => return error.MediaChanged,
3433 else => |status| return uefi.unexpectedStatus(status),
3534 }
3635 }
lib/std/os/uefi/protocol/simple_network.zig+58-59
......@@ -4,7 +4,6 @@ const Event = uefi.Event;
44const Guid = uefi.Guid;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98pub const SimpleNetwork = extern struct {
109 revision: u64,
......@@ -110,10 +109,10 @@ pub const SimpleNetwork = extern struct {
110109 pub fn start(self: *SimpleNetwork) StartError!void {
111110 switch (self._start(self)) {
112111 .success => {},
113 .already_started => return Error.AlreadyStarted,
114 .invalid_parameter => return Error.InvalidParameter,
115 .device_error => return Error.DeviceError,
116 .unsupported => return Error.Unsupported,
112 .already_started => return error.AlreadyStarted,
113 .invalid_parameter => return error.InvalidParameter,
114 .device_error => return error.DeviceError,
115 .unsupported => return error.Unsupported,
117116 else => |status| return uefi.unexpectedStatus(status),
118117 }
119118 }
......@@ -122,10 +121,10 @@ pub const SimpleNetwork = extern struct {
122121 pub fn stop(self: *SimpleNetwork) StopError!void {
123122 switch (self._stop(self)) {
124123 .success => {},
125 .not_started => return Error.NotStarted,
126 .invalid_parameter => return Error.InvalidParameter,
127 .device_error => return Error.DeviceError,
128 .unsupported => return Error.Unsupported,
124 .not_started => return error.NotStarted,
125 .invalid_parameter => return error.InvalidParameter,
126 .device_error => return error.DeviceError,
127 .unsupported => return error.Unsupported,
129128 else => |status| return uefi.unexpectedStatus(status),
130129 }
131130 }
......@@ -138,11 +137,11 @@ pub const SimpleNetwork = extern struct {
138137 ) InitializeError!void {
139138 switch (self._initialize(self, extra_rx_buffer_size, extra_tx_buffer_size)) {
140139 .success => {},
141 .not_started => return Error.NotStarted,
142 .out_of_resources => return Error.OutOfResources,
143 .invalid_parameter => return Error.InvalidParameter,
144 .device_error => return Error.DeviceError,
145 .unsupported => return Error.Unsupported,
140 .not_started => return error.NotStarted,
141 .out_of_resources => return error.OutOfResources,
142 .invalid_parameter => return error.InvalidParameter,
143 .device_error => return error.DeviceError,
144 .unsupported => return error.Unsupported,
146145 else => |status| return uefi.unexpectedStatus(status),
147146 }
148147 }
......@@ -151,10 +150,10 @@ pub const SimpleNetwork = extern struct {
151150 pub fn reset(self: *SimpleNetwork, extended_verification: bool) ResetError!void {
152151 switch (self._reset(self, extended_verification)) {
153152 .success => {},
154 .not_started => return Error.NotStarted,
155 .invalid_parameter => return Error.InvalidParameter,
156 .device_error => return Error.DeviceError,
157 .unsupported => return Error.Unsupported,
153 .not_started => return error.NotStarted,
154 .invalid_parameter => return error.InvalidParameter,
155 .device_error => return error.DeviceError,
156 .unsupported => return error.Unsupported,
158157 else => |status| return uefi.unexpectedStatus(status),
159158 }
160159 }
......@@ -163,9 +162,9 @@ pub const SimpleNetwork = extern struct {
163162 pub fn shutdown(self: *SimpleNetwork) ShutdownError!void {
164163 switch (self._shutdown(self)) {
165164 .success => {},
166 .not_started => return ShutdownError.NotStarted,
167 .invalid_parameter => return ShutdownError.InvalidParameter,
168 .device_error => return ShutdownError.DeviceError,
165 .not_started => return error.NotStarted,
166 .invalid_parameter => return error.InvalidParameter,
167 .device_error => return error.DeviceError,
169168 else => |status| return uefi.unexpectedStatus(status),
170169 }
171170 }
......@@ -186,10 +185,10 @@ pub const SimpleNetwork = extern struct {
186185
187186 switch (self._receive_filters(self, enable, disable, reset_mcast_filter, count, ptr)) {
188187 .success => {},
189 .not_started => return Error.NotStarted,
190 .invalid_parameter => return Error.InvalidParameter,
191 .device_error => return Error.DeviceError,
192 .unsupported => return Error.Unsupported,
188 .not_started => return error.NotStarted,
189 .invalid_parameter => return error.InvalidParameter,
190 .device_error => return error.DeviceError,
191 .unsupported => return error.Unsupported,
193192 else => |status| return uefi.unexpectedStatus(status),
194193 }
195194 }
......@@ -202,10 +201,10 @@ pub const SimpleNetwork = extern struct {
202201 ) StationAddressError!void {
203202 switch (self._station_address(self, reset_flag, new)) {
204203 .success => {},
205 .not_started => return Error.NotStarted,
206 .invalid_parameter => return Error.InvalidParameter,
207 .device_error => return Error.DeviceError,
208 .unsupported => return Error.Unsupported,
204 .not_started => return error.NotStarted,
205 .invalid_parameter => return error.InvalidParameter,
206 .device_error => return error.DeviceError,
207 .unsupported => return error.Unsupported,
209208 else => |status| return uefi.unexpectedStatus(status),
210209 }
211210 }
......@@ -213,10 +212,10 @@ pub const SimpleNetwork = extern struct {
213212 pub fn resetStatistics(self: *SimpleNetwork) StatisticsError!void {
214213 switch (self._statistics(self, true, null, null)) {
215214 .success => {},
216 .not_started => return Error.NotStarted,
217 .invalid_parameter => return Error.InvalidParameter,
218 .device_error => return Error.DeviceError,
219 .unsupported => return Error.Unsupported,
215 .not_started => return error.NotStarted,
216 .invalid_parameter => return error.InvalidParameter,
217 .device_error => return error.DeviceError,
218 .unsupported => return error.Unsupported,
220219 else => |status| return uefi.unexpectedStatus(status),
221220 }
222221 }
......@@ -227,10 +226,10 @@ pub const SimpleNetwork = extern struct {
227226 var stats_size: usize = @sizeOf(Statistics);
228227 switch (self._statistics(self, reset_flag, &stats_size, &stats)) {
229228 .success => {},
230 .not_started => return Error.NotStarted,
231 .invalid_parameter => return Error.InvalidParameter,
232 .device_error => return Error.DeviceError,
233 .unsupported => return Error.Unsupported,
229 .not_started => return error.NotStarted,
230 .invalid_parameter => return error.InvalidParameter,
231 .device_error => return error.DeviceError,
232 .unsupported => return error.Unsupported,
234233 else => |status| return uefi.unexpectedStatus(status),
235234 }
236235
......@@ -249,10 +248,10 @@ pub const SimpleNetwork = extern struct {
249248 var mac: MacAddress = undefined;
250249 switch (self._mcast_ip_to_mac(self, ipv6, ip, &mac)) {
251250 .success => return mac,
252 .not_started => return Error.NotStarted,
253 .invalid_parameter => return Error.InvalidParameter,
254 .device_error => return Error.DeviceError,
255 .unsupported => return Error.Unsupported,
251 .not_started => return error.NotStarted,
252 .invalid_parameter => return error.InvalidParameter,
253 .device_error => return error.DeviceError,
254 .unsupported => return error.Unsupported,
256255 else => |status| return uefi.unexpectedStatus(status),
257256 }
258257 }
......@@ -273,10 +272,10 @@ pub const SimpleNetwork = extern struct {
273272 buffer.ptr,
274273 )) {
275274 .success => {},
276 .not_started => return Error.NotStarted,
277 .invalid_parameter => return Error.InvalidParameter,
278 .device_error => return Error.DeviceError,
279 .unsupported => return Error.Unsupported,
275 .not_started => return error.NotStarted,
276 .invalid_parameter => return error.InvalidParameter,
277 .device_error => return error.DeviceError,
278 .unsupported => return error.Unsupported,
280279 else => |status| return uefi.unexpectedStatus(status),
281280 }
282281 }
......@@ -289,9 +288,9 @@ pub const SimpleNetwork = extern struct {
289288 ) GetStatusError!void {
290289 switch (self._get_status(self, interrupt_status, recycled_tx_buf)) {
291290 .success => {},
292 .not_started => return Error.NotStarted,
293 .invalid_parameter => return Error.InvalidParameter,
294 .device_error => return Error.DeviceError,
291 .not_started => return error.NotStarted,
292 .invalid_parameter => return error.InvalidParameter,
293 .device_error => return error.DeviceError,
295294 else => |status| return uefi.unexpectedStatus(status),
296295 }
297296 }
......@@ -315,12 +314,12 @@ pub const SimpleNetwork = extern struct {
315314 protocol,
316315 )) {
317316 .success => {},
318 .not_started => return Error.NotStarted,
319 .not_ready => return Error.NotReady,
320 .buffer_too_small => return Error.BufferTooSmall,
321 .invalid_parameter => return Error.InvalidParameter,
322 .device_error => return Error.DeviceError,
323 .unsupported => return Error.Unsupported,
317 .not_started => return error.NotStarted,
318 .not_ready => return error.NotReady,
319 .buffer_too_small => return error.BufferTooSmall,
320 .invalid_parameter => return error.InvalidParameter,
321 .device_error => return error.DeviceError,
322 .unsupported => return error.Unsupported,
324323 else => |status| return uefi.unexpectedStatus(status),
325324 }
326325 }
......@@ -340,11 +339,11 @@ pub const SimpleNetwork = extern struct {
340339 &packet.protocol,
341340 )) {
342341 .success => return packet,
343 .not_started => return Error.NotStarted,
344 .not_ready => return Error.NotReady,
345 .buffer_too_small => return Error.BufferTooSmall,
346 .invalid_parameter => return Error.InvalidParameter,
347 .device_error => return Error.DeviceError,
342 .not_started => return error.NotStarted,
343 .not_ready => return error.NotReady,
344 .buffer_too_small => return error.BufferTooSmall,
345 .invalid_parameter => return error.InvalidParameter,
346 .device_error => return error.DeviceError,
348347 else => |status| return uefi.unexpectedStatus(status),
349348 }
350349 }
lib/std/os/uefi/protocol/simple_pointer.zig+3-4
......@@ -4,7 +4,6 @@ const Event = uefi.Event;
44const Guid = uefi.Guid;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98/// Protocol for mice.
109pub const SimplePointer = struct {
......@@ -23,7 +22,7 @@ pub const SimplePointer = struct {
2322 pub fn reset(self: *SimplePointer, verify: bool) ResetError!void {
2423 switch (self._reset(self, verify)) {
2524 .success => {},
26 .device_error => return Error.DeviceError,
25 .device_error => return error.DeviceError,
2726 else => |status| return uefi.unexpectedStatus(status),
2827 }
2928 }
......@@ -33,8 +32,8 @@ pub const SimplePointer = struct {
3332 var state: State = undefined;
3433 switch (self._get_state(self, &state)) {
3534 .success => return state,
36 .not_ready => return Error.NotReady,
37 .device_error => return Error.DeviceError,
35 .not_ready => return error.NotReady,
36 .device_error => return error.DeviceError,
3837 else => |status| return uefi.unexpectedStatus(status),
3938 }
4039 }
lib/std/os/uefi/protocol/simple_text_input.zig+4-5
......@@ -4,7 +4,6 @@ const Event = uefi.Event;
44const Guid = uefi.Guid;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98/// Character input devices, e.g. Keyboard
109pub const SimpleTextInput = extern struct {
......@@ -23,7 +22,7 @@ pub const SimpleTextInput = extern struct {
2322 pub fn reset(self: *SimpleTextInput, verify: bool) ResetError!void {
2423 switch (self._reset(self, verify)) {
2524 .success => {},
26 .device_error => return Error.DeviceError,
25 .device_error => return error.DeviceError,
2726 else => |status| return uefi.unexpectedStatus(status),
2827 }
2928 }
......@@ -33,9 +32,9 @@ pub const SimpleTextInput = extern struct {
3332 var key: Key.Input = undefined;
3433 switch (self._read_key_stroke(self, &key)) {
3534 .success => return key,
36 .not_ready => return Error.NotReady,
37 .device_error => return Error.DeviceError,
38 .unsupported => return Error.Unsupported,
35 .not_ready => return error.NotReady,
36 .device_error => return error.DeviceError,
37 .unsupported => return error.Unsupported,
3938 else => |status| return uefi.unexpectedStatus(status),
4039 }
4140 }
lib/std/os/uefi/protocol/simple_text_input_ex.zig+8-9
......@@ -4,7 +4,6 @@ const Event = uefi.Event;
44const Guid = uefi.Guid;
55const Status = uefi.Status;
66const cc = uefi.cc;
7const Error = Status.Error;
87
98/// Character input devices, e.g. Keyboard
109pub const SimpleTextInputEx = extern struct {
......@@ -32,7 +31,7 @@ pub const SimpleTextInputEx = extern struct {
3231 pub fn reset(self: *SimpleTextInputEx, verify: bool) ResetError!void {
3332 switch (self._reset(self, verify)) {
3433 .success => {},
35 .device_error => return Error.DeviceError,
34 .device_error => return error.DeviceError,
3635 else => |status| return uefi.unexpectedStatus(status),
3736 }
3837 }
......@@ -42,9 +41,9 @@ pub const SimpleTextInputEx = extern struct {
4241 var key: Key = undefined;
4342 switch (self._read_key_stroke_ex(self, &key)) {
4443 .success => return key,
45 .not_ready => return Error.NotReady,
46 .device_error => return Error.DeviceError,
47 .unsupported => return Error.Unsupported,
44 .not_ready => return error.NotReady,
45 .device_error => return error.DeviceError,
46 .unsupported => return error.Unsupported,
4847 else => |status| return uefi.unexpectedStatus(status),
4948 }
5049 }
......@@ -53,8 +52,8 @@ pub const SimpleTextInputEx = extern struct {
5352 pub fn setState(self: *SimpleTextInputEx, state: *const Key.State.Toggle) SetStateError!void {
5453 switch (self._set_state(self, @ptrCast(state))) {
5554 .success => {},
56 .device_error => return Error.DeviceError,
57 .unsupported => return Error.Unsupported,
55 .device_error => return error.DeviceError,
56 .unsupported => return error.Unsupported,
5857 else => |status| return uefi.unexpectedStatus(status),
5958 }
6059 }
......@@ -68,7 +67,7 @@ pub const SimpleTextInputEx = extern struct {
6867 var handle: uefi.Handle = undefined;
6968 switch (self._register_key_notify(self, key_data, notify, &handle)) {
7069 .success => return handle,
71 .out_of_resources => return Error.OutOfResources,
70 .out_of_resources => return error.OutOfResources,
7271 else => |status| return uefi.unexpectedStatus(status),
7372 }
7473 }
......@@ -80,7 +79,7 @@ pub const SimpleTextInputEx = extern struct {
8079 ) UnregisterKeyNotifyError!void {
8180 switch (self._unregister_key_notify(self, handle)) {
8281 .success => {},
83 .invalid_parameter => return Error.InvalidParameter,
82 .invalid_parameter => return error.InvalidParameter,
8483 else => |status| return uefi.unexpectedStatus(status),
8584 }
8685 }
lib/std/os/uefi/protocol/simple_text_output.zig+14-15
......@@ -3,7 +3,6 @@ const uefi = std.os.uefi;
33const Guid = uefi.Guid;
44const Status = uefi.Status;
55const cc = uefi.cc;
6const Error = Status.Error;
76
87/// Character output devices
98pub const SimpleTextOutput = extern struct {
......@@ -49,7 +48,7 @@ pub const SimpleTextOutput = extern struct {
4948 pub fn reset(self: *SimpleTextOutput, verify: bool) ResetError!void {
5049 switch (self._reset(self, verify)) {
5150 .success => {},
52 .device_error => return Error.DeviceError,
51 .device_error => return error.DeviceError,
5352 else => |status| return uefi.unexpectedStatus(status),
5453 }
5554 }
......@@ -61,8 +60,8 @@ pub const SimpleTextOutput = extern struct {
6160 switch (self._output_string(self, msg)) {
6261 .success => return true,
6362 .warn_unknown_glyph => return false,
64 .device_error => return Error.DeviceError,
65 .unsupported => return Error.Unsupported,
63 .device_error => return error.DeviceError,
64 .unsupported => return error.Unsupported,
6665 else => |status| return uefi.unexpectedStatus(status),
6766 }
6867 }
......@@ -81,8 +80,8 @@ pub const SimpleTextOutput = extern struct {
8180 var geo: Geometry = undefined;
8281 switch (self._query_mode(self, mode_number, &geo.columns, &geo.rows)) {
8382 .success => return geo,
84 .device_error => return Error.DeviceError,
85 .unsupported => return Error.Unsupported,
83 .device_error => return error.DeviceError,
84 .unsupported => return error.Unsupported,
8685 else => |status| return uefi.unexpectedStatus(status),
8786 }
8887 }
......@@ -91,8 +90,8 @@ pub const SimpleTextOutput = extern struct {
9190 pub fn setMode(self: *SimpleTextOutput, mode_number: usize) SetModeError!void {
9291 switch (self._set_mode(self, mode_number)) {
9392 .success => {},
94 .device_error => return Error.DeviceError,
95 .unsupported => return Error.Unsupported,
93 .device_error => return error.DeviceError,
94 .unsupported => return error.Unsupported,
9695 else => |status| return uefi.unexpectedStatus(status),
9796 }
9897 }
......@@ -102,7 +101,7 @@ pub const SimpleTextOutput = extern struct {
102101 const attr_as_num: u8 = @bitCast(attribute);
103102 switch (self._set_attribute(self, @intCast(attr_as_num))) {
104103 .success => {},
105 .device_error => return Error.DeviceError,
104 .device_error => return error.DeviceError,
106105 else => |status| return uefi.unexpectedStatus(status),
107106 }
108107 }
......@@ -111,8 +110,8 @@ pub const SimpleTextOutput = extern struct {
111110 pub fn clearScreen(self: *SimpleTextOutput) ClearScreenError!void {
112111 switch (self._clear_screen(self)) {
113112 .success => {},
114 .device_error => return Error.DeviceError,
115 .unsupported => return Error.Unsupported,
113 .device_error => return error.DeviceError,
114 .unsupported => return error.Unsupported,
116115 else => |status| return uefi.unexpectedStatus(status),
117116 }
118117 }
......@@ -125,8 +124,8 @@ pub const SimpleTextOutput = extern struct {
125124 ) SetCursorPositionError!void {
126125 switch (self._set_cursor_position(self, column, row)) {
127126 .success => {},
128 .device_error => return Error.DeviceError,
129 .unsupported => return Error.Unsupported,
127 .device_error => return error.DeviceError,
128 .unsupported => return error.Unsupported,
130129 else => |status| return uefi.unexpectedStatus(status),
131130 }
132131 }
......@@ -135,8 +134,8 @@ pub const SimpleTextOutput = extern struct {
135134 pub fn enableCursor(self: *SimpleTextOutput, visible: bool) EnableCursorError!void {
136135 switch (self._enable_cursor(self, visible)) {
137136 .success => {},
138 .device_error => return Error.DeviceError,
139 .unsupported => return Error.Unsupported,
137 .device_error => return error.DeviceError,
138 .unsupported => return error.Unsupported,
140139 else => |status| return uefi.unexpectedStatus(status),
141140 }
142141 }
lib/std/os/uefi/protocol/udp6.zig+37-38
......@@ -8,7 +8,6 @@ const Ip6 = uefi.protocol.Ip6;
88const ManagedNetworkConfigData = uefi.protocol.ManagedNetwork.Config;
99const SimpleNetwork = uefi.protocol.SimpleNetwork;
1010const cc = uefi.cc;
11const Error = Status.Error;
1211
1312pub const Udp6 = extern struct {
1413 _get_mode_data: *const fn (*const Udp6, ?*Config, ?*Ip6.Mode, ?*ManagedNetworkConfigData, ?*SimpleNetwork) callconv(cc) Status,
......@@ -81,8 +80,8 @@ pub const Udp6 = extern struct {
8180 &data.snp_mode_data,
8281 )) {
8382 .success => return data,
84 .not_started => return Error.NotStarted,
85 .invalid_parameter => return Error.InvalidParameter,
83 .not_started => return error.NotStarted,
84 .invalid_parameter => return error.InvalidParameter,
8685 else => |status| return uefi.unexpectedStatus(status),
8786 }
8887 }
......@@ -90,12 +89,12 @@ pub const Udp6 = extern struct {
9089 pub fn configure(self: *Udp6, udp6_config_data: ?*const Config) ConfigureError!void {
9190 switch (self._configure(self, udp6_config_data)) {
9291 .success => {},
93 .no_mapping => return Error.NoMapping,
94 .invalid_parameter => return Error.InvalidParameter,
95 .already_started => return Error.AlreadyStarted,
96 .access_denied => return Error.AccessDenied,
97 .out_of_resources => return Error.OutOfResources,
98 .device_error => return Error.DeviceError,
92 .no_mapping => return error.NoMapping,
93 .invalid_parameter => return error.InvalidParameter,
94 .already_started => return error.AlreadyStarted,
95 .access_denied => return error.AccessDenied,
96 .out_of_resources => return error.OutOfResources,
97 .device_error => return error.DeviceError,
9998 else => |status| return uefi.unexpectedStatus(status),
10099 }
101100 }
......@@ -112,12 +111,12 @@ pub const Udp6 = extern struct {
112111 multicast_address,
113112 )) {
114113 .success => {},
115 .not_started => return Error.NotStarted,
116 .out_of_resources => return Error.OutOfResources,
117 .invalid_parameter => return Error.InvalidParameter,
118 .already_started => return Error.AlreadyStarted,
119 .not_found => return Error.NotFound,
120 .device_error => return Error.DeviceError,
114 .not_started => return error.NotStarted,
115 .out_of_resources => return error.OutOfResources,
116 .invalid_parameter => return error.InvalidParameter,
117 .already_started => return error.AlreadyStarted,
118 .not_found => return error.NotFound,
119 .device_error => return error.DeviceError,
121120 else => |status| return uefi.unexpectedStatus(status),
122121 }
123122 }
......@@ -125,15 +124,15 @@ pub const Udp6 = extern struct {
125124 pub fn transmit(self: *Udp6, token: *CompletionToken) TransmitError!void {
126125 switch (self._transmit(self, token)) {
127126 .success => {},
128 .not_started => return Error.NotStarted,
129 .no_mapping => return Error.NoMapping,
130 .invalid_parameter => return Error.InvalidParameter,
131 .access_denied => return Error.AccessDenied,
132 .not_ready => return Error.NotReady,
133 .out_of_resources => return Error.OutOfResources,
134 .not_found => return Error.NotFound,
135 .bad_buffer_size => return Error.BadBufferSize,
136 .no_media => return Error.NoMedia,
127 .not_started => return error.NotStarted,
128 .no_mapping => return error.NoMapping,
129 .invalid_parameter => return error.InvalidParameter,
130 .access_denied => return error.AccessDenied,
131 .not_ready => return error.NotReady,
132 .out_of_resources => return error.OutOfResources,
133 .not_found => return error.NotFound,
134 .bad_buffer_size => return error.BadBufferSize,
135 .no_media => return error.NoMedia,
137136 else => |status| return uefi.unexpectedStatus(status),
138137 }
139138 }
......@@ -141,14 +140,14 @@ pub const Udp6 = extern struct {
141140 pub fn receive(self: *Udp6, token: *CompletionToken) ReceiveError!void {
142141 switch (self._receive(self, token)) {
143142 .success => {},
144 .not_started => return Error.NotStarted,
145 .no_mapping => return Error.NoMapping,
146 .invalid_parameter => return Error.InvalidParameter,
147 .out_of_resources => return Error.OutOfResources,
148 .device_error => return Error.DeviceError,
149 .access_denied => return Error.AccessDenied,
150 .not_ready => return Error.NotReady,
151 .no_media => return Error.NoMedia,
143 .not_started => return error.NotStarted,
144 .no_mapping => return error.NoMapping,
145 .invalid_parameter => return error.InvalidParameter,
146 .out_of_resources => return error.OutOfResources,
147 .device_error => return error.DeviceError,
148 .access_denied => return error.AccessDenied,
149 .not_ready => return error.NotReady,
150 .no_media => return error.NoMedia,
152151 else => |status| return uefi.unexpectedStatus(status),
153152 }
154153 }
......@@ -156,9 +155,9 @@ pub const Udp6 = extern struct {
156155 pub fn cancel(self: *Udp6, token: ?*CompletionToken) CancelError!void {
157156 switch (self._cancel(self, token)) {
158157 .success => {},
159 .invalid_parameter => return Error.InvalidParameter,
160 .not_started => return Error.NotStarted,
161 .not_found => return Error.NotFound,
158 .invalid_parameter => return error.InvalidParameter,
159 .not_started => return error.NotStarted,
160 .not_found => return error.NotFound,
162161 else => |status| return uefi.unexpectedStatus(status),
163162 }
164163 }
......@@ -166,9 +165,9 @@ pub const Udp6 = extern struct {
166165 pub fn poll(self: *Udp6) PollError!void {
167166 switch (self._poll(self)) {
168167 .success => {},
169 .invalid_parameter => return Error.InvalidParameter,
170 .device_error => return Error.DeviceError,
171 .timeout => return Error.Timeout,
168 .invalid_parameter => return error.InvalidParameter,
169 .device_error => return error.DeviceError,
170 .timeout => return error.Timeout,
172171 else => |status| return uefi.unexpectedStatus(status),
173172 }
174173 }