authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-12 20:58:29-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-03-12 20:58:29-04:00
log5dd3c8eed65c020a5c5672ee595b16120b3dc431
treeafd09d6bb434b41fc2f5838dbabe38ad77dea432
parent2f06971a7e2f004b76c0ac4502c3e84cd63a1fba
parentf44530302ecef3263cf39eff829d7c3e53e9f95d
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4727 from nrdmn/uefi3

std/os/uefi: various improvements and some refactoring

31 files changed, 797 insertions(+), 349 deletions(-)

lib/std/os.zig+2-2
......@@ -273,10 +273,10 @@ pub fn exit(status: u8) noreturn {
273273 // exit() is only avaliable if exitBootServices() has not been called yet.
274274 // This call to exit should not fail, so we don't care about its return value.
275275 if (uefi.system_table.boot_services) |bs| {
276 _ = bs.exit(uefi.handle, status, 0, null);
276 _ = bs.exit(uefi.handle, @intToEnum(uefi.Status, status), 0, null);
277277 }
278278 // If we can't exit, reboot the system instead.
279 uefi.system_table.runtime_services.resetSystem(uefi.tables.ResetType.ResetCold, status, 0, null);
279 uefi.system_table.runtime_services.resetSystem(uefi.tables.ResetType.ResetCold, @intToEnum(uefi.Status, status), 0, null);
280280 }
281281 system.exit(status);
282282}
lib/std/os/uefi.zig+5-2
......@@ -2,7 +2,7 @@
22pub const protocols = @import("uefi/protocols.zig");
33
44/// Status codes returned by EFI interfaces
5pub const status = @import("uefi/status.zig");
5pub const Status = @import("uefi/status.zig").Status;
66pub const tables = @import("uefi/tables.zig");
77
88const fmt = @import("std").fmt;
......@@ -32,7 +32,7 @@ pub const Guid = extern struct {
3232 options: fmt.FormatOptions,
3333 context: var,
3434 comptime Errors: type,
35 output: fn (@TypeOf(context), []const u8) Errors!void,
35 comptime output: fn (@TypeOf(context), []const u8) Errors!void,
3636 ) Errors!void {
3737 if (f.len == 0) {
3838 return fmt.format(context, Errors, output, "{x:0>8}-{x:0>4}-{x:0>4}-{x:0>2}{x:0>2}-{x:0>12}", .{
......@@ -105,3 +105,6 @@ pub const TimeCapabilities = extern struct {
105105 /// If true, a time set operation clears the device's time below the resolution level.
106106 sets_to_zero: bool,
107107};
108
109/// File Handle as specified in the EFI Shell Spec
110pub const FileHandle = *@OpaqueType();
lib/std/os/uefi/protocols.zig+11
......@@ -1,6 +1,15 @@
11pub const LoadedImageProtocol = @import("protocols/loaded_image_protocol.zig").LoadedImageProtocol;
2pub const loaded_image_device_path_protocol_guid = @import("protocols/loaded_image_protocol.zig").loaded_image_device_path_protocol_guid;
23
4pub const AcpiDevicePath = @import("protocols/device_path_protocol.zig").AcpiDevicePath;
5pub const BiosBootSpecificationDevicePath = @import("protocols/device_path_protocol.zig").BiosBootSpecificationDevicePath;
6pub const DevicePath = @import("protocols/device_path_protocol.zig").DevicePath;
37pub const DevicePathProtocol = @import("protocols/device_path_protocol.zig").DevicePathProtocol;
8pub const DevicePathType = @import("protocols/device_path_protocol.zig").DevicePathType;
9pub const EndDevicePath = @import("protocols/device_path_protocol.zig").EndDevicePath;
10pub const HardwareDevicePath = @import("protocols/device_path_protocol.zig").HardwareDevicePath;
11pub const MediaDevicePath = @import("protocols/device_path_protocol.zig").MediaDevicePath;
12pub const MessagingDevicePath = @import("protocols/device_path_protocol.zig").MessagingDevicePath;
413
514pub const SimpleFileSystemProtocol = @import("protocols/simple_file_system_protocol.zig").SimpleFileSystemProtocol;
615pub const FileProtocol = @import("protocols/file_protocol.zig").FileProtocol;
......@@ -86,3 +95,5 @@ pub const HIIPopupType = @import("protocols/hii_popup_protocol.zig").HIIPopupTyp
8695pub const HIIPopupSelection = @import("protocols/hii_popup_protocol.zig").HIIPopupSelection;
8796
8897pub const RNGProtocol = @import("protocols/rng_protocol.zig").RNGProtocol;
98
99pub const ShellParametersProtocol = @import("protocols/shell_parameters_protocol.zig").ShellParametersProtocol;
lib/std/os/uefi/protocols/absolute_pointer_protocol.zig+5-4
......@@ -1,21 +1,22 @@
11const uefi = @import("std").os.uefi;
22const Event = uefi.Event;
33const Guid = uefi.Guid;
4const Status = uefi.Status;
45
56/// Protocol for touchscreens
67pub const AbsolutePointerProtocol = extern struct {
7 _reset: extern fn (*const AbsolutePointerProtocol, bool) usize,
8 _get_state: extern fn (*const AbsolutePointerProtocol, *AbsolutePointerState) usize,
8 _reset: extern fn (*const AbsolutePointerProtocol, bool) Status,
9 _get_state: extern fn (*const AbsolutePointerProtocol, *AbsolutePointerState) Status,
910 wait_for_input: Event,
1011 mode: *AbsolutePointerMode,
1112
1213 /// Resets the pointer device hardware.
13 pub fn reset(self: *const AbsolutePointerProtocol, verify: bool) usize {
14 pub fn reset(self: *const AbsolutePointerProtocol, verify: bool) Status {
1415 return self._reset(self, verify);
1516 }
1617
1718 /// Retrieves the current state of a pointer device.
18 pub fn getState(self: *const AbsolutePointerProtocol, state: *AbsolutePointerState) usize {
19 pub fn getState(self: *const AbsolutePointerProtocol, state: *AbsolutePointerState) Status {
1920 return self._get_state(self, state);
2021 }
2122
lib/std/os/uefi/protocols/device_path_protocol.zig+338-2
......@@ -1,8 +1,8 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33
4pub const DevicePathProtocol = extern struct {
5 type: u8,
4pub const DevicePathProtocol = packed struct {
5 type: DevicePathType,
66 subtype: u8,
77 length: u16,
88
......@@ -14,4 +14,340 @@ pub const DevicePathProtocol = extern struct {
1414 .clock_seq_low = 0x39,
1515 .node = [_]u8{ 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b },
1616 };
17
18 pub fn getDevicePath(self: *const DevicePathProtocol) ?DevicePath {
19 return switch (self.type) {
20 .Hardware => blk: {
21 const hardware: ?HardwareDevicePath = switch (@intToEnum(HardwareDevicePath.Subtype, self.subtype)) {
22 .Pci => .{ .Pci = @ptrCast(*const HardwareDevicePath.PciDevicePath, self) },
23 .PcCard => .{ .PcCard = @ptrCast(*const HardwareDevicePath.PcCardDevicePath, self) },
24 .MemoryMapped => .{ .MemoryMapped = @ptrCast(*const HardwareDevicePath.MemoryMappedDevicePath, self) },
25 .Vendor => .{ .Vendor = @ptrCast(*const HardwareDevicePath.VendorDevicePath, self) },
26 .Controller => .{ .Controller = @ptrCast(*const HardwareDevicePath.ControllerDevicePath, self) },
27 .Bmc => .{ .Bmc = @ptrCast(*const HardwareDevicePath.BmcDevicePath, self) },
28 _ => null,
29 };
30 break :blk if (hardware) |h| .{ .Hardware = h } else null;
31 },
32 .Acpi => blk: {
33 const acpi: ?AcpiDevicePath = switch (@intToEnum(AcpiDevicePath.Subtype, self.subtype)) {
34 else => null, // TODO
35 };
36 break :blk if (acpi) |a| .{ .Acpi = a } else null;
37 },
38 .Messaging => blk: {
39 const messaging: ?MessagingDevicePath = switch (@intToEnum(MessagingDevicePath.Subtype, self.subtype)) {
40 else => null, // TODO
41 };
42 break :blk if (messaging) |m| .{ .Messaging = m } else null;
43 },
44 .Media => blk: {
45 const media: ?MediaDevicePath = switch (@intToEnum(MediaDevicePath.Subtype, self.subtype)) {
46 .HardDrive => .{ .HardDrive = @ptrCast(*const MediaDevicePath.HardDriveDevicePath, self) },
47 .Cdrom => .{ .Cdrom = @ptrCast(*const MediaDevicePath.CdromDevicePath, self) },
48 .Vendor => .{ .Vendor = @ptrCast(*const MediaDevicePath.VendorDevicePath, self) },
49 .FilePath => .{ .FilePath = @ptrCast(*const MediaDevicePath.FilePathDevicePath, self) },
50 .MediaProtocol => .{ .MediaProtocol = @ptrCast(*const MediaDevicePath.MediaProtocolDevicePath, self) },
51 .PiwgFirmwareFile => .{ .PiwgFirmwareFile = @ptrCast(*const MediaDevicePath.PiwgFirmwareFileDevicePath, self) },
52 .PiwgFirmwareVolume => .{ .PiwgFirmwareVolume = @ptrCast(*const MediaDevicePath.PiwgFirmwareVolumeDevicePath, self) },
53 .RelativeOffsetRange => .{ .RelativeOffsetRange = @ptrCast(*const MediaDevicePath.RelativeOffsetRangeDevicePath, self) },
54 .RamDisk => .{ .RamDisk = @ptrCast(*const MediaDevicePath.RamDiskDevicePath, self) },
55 _ => null,
56 };
57 break :blk if (media) |m| .{ .Media = m } else null;
58 },
59 .BiosBootSpecification => blk: {
60 const bbs: ?BiosBootSpecificationDevicePath = switch (@intToEnum(BiosBootSpecificationDevicePath.Subtype, self.subtype)) {
61 .BBS101 => .{ .BBS101 = @ptrCast(*const BiosBootSpecificationDevicePath.BBS101DevicePath, self) },
62 _ => null,
63 };
64 break :blk if (bbs) |b| .{ .BiosBootSpecification = b } else null;
65 },
66 .End => blk: {
67 const end: ?EndDevicePath = switch (@intToEnum(EndDevicePath.Subtype, self.subtype)) {
68 .EndEntire => .{ .EndEntire = @ptrCast(*const EndDevicePath.EndEntireDevicePath, self) },
69 .EndThisInstance => .{ .EndThisInstance = @ptrCast(*const EndDevicePath.EndThisInstanceDevicePath, self) },
70 _ => null,
71 };
72 break :blk if (end) |e| .{ .End = e } else null;
73 },
74 _ => null,
75 };
76 }
77};
78
79pub const DevicePath = union(DevicePathType) {
80 Hardware: HardwareDevicePath,
81 Acpi: AcpiDevicePath,
82 Messaging: MessagingDevicePath,
83 Media: MediaDevicePath,
84 BiosBootSpecification: BiosBootSpecificationDevicePath,
85 End: EndDevicePath,
86};
87
88pub const DevicePathType = extern enum(u8) {
89 Hardware = 0x01,
90 Acpi = 0x02,
91 Messaging = 0x03,
92 Media = 0x04,
93 BiosBootSpecification = 0x05,
94 End = 0x7f,
95 _,
96};
97
98pub const HardwareDevicePath = union(Subtype) {
99 Pci: *const PciDevicePath,
100 PcCard: *const PcCardDevicePath,
101 MemoryMapped: *const MemoryMappedDevicePath,
102 Vendor: *const VendorDevicePath,
103 Controller: *const ControllerDevicePath,
104 Bmc: *const BmcDevicePath,
105
106 pub const Subtype = extern enum(u8) {
107 Pci = 1,
108 PcCard = 2,
109 MemoryMapped = 3,
110 Vendor = 4,
111 Controller = 5,
112 Bmc = 6,
113 _,
114 };
115
116 pub const PciDevicePath = packed struct {
117 type: DevicePathType,
118 subtype: Subtype,
119 length: u16,
120 // TODO
121 };
122
123 pub const PcCardDevicePath = packed struct {
124 type: DevicePathType,
125 subtype: Subtype,
126 length: u16,
127 // TODO
128 };
129
130 pub const MemoryMappedDevicePath = packed struct {
131 type: DevicePathType,
132 subtype: Subtype,
133 length: u16,
134 // TODO
135 };
136
137 pub const VendorDevicePath = packed struct {
138 type: DevicePathType,
139 subtype: Subtype,
140 length: u16,
141 // TODO
142 };
143
144 pub const ControllerDevicePath = packed struct {
145 type: DevicePathType,
146 subtype: Subtype,
147 length: u16,
148 // TODO
149 };
150
151 pub const BmcDevicePath = packed struct {
152 type: DevicePathType,
153 subtype: Subtype,
154 length: u16,
155 // TODO
156 };
157};
158
159pub const AcpiDevicePath = union(Subtype) {
160 Acpi: void, // TODO
161 ExpandedAcpi: void, // TODO
162 Adr: void, // TODO
163 Nvdimm: void, // TODO
164
165 pub const Subtype = extern enum(u8) {
166 Acpi = 1,
167 ExpandedAcpi = 2,
168 Adr = 3,
169 Nvdimm = 4,
170 _,
171 };
172};
173
174pub const MessagingDevicePath = union(Subtype) {
175 Atapi: void, // TODO
176 Scsi: void, // TODO
177 FibreChannel: void, // TODO
178 FibreChannelEx: void, // TODO
179 @"1394": void, // TODO
180 Usb: void, // TODO
181 Sata: void, // TODO
182 UsbWwid: void, // TODO
183 Lun: void, // TODO
184 UsbClass: void, // TODO
185 I2o: void, // TODO
186 MacAddress: void, // TODO
187 Ipv4: void, // TODO
188 Ipv6: void, // TODO
189 Vlan: void, // TODO
190 InfiniBand: void, // TODO
191 Uart: void, // TODO
192 Vendor: void, // TODO
193
194 pub const Subtype = extern enum(u8) {
195 Atapi = 1,
196 Scsi = 2,
197 FibreChannel = 3,
198 FibreChannelEx = 21,
199 @"1394" = 4,
200 Usb = 5,
201 Sata = 18,
202 UsbWwid = 16,
203 Lun = 17,
204 UsbClass = 15,
205 I2o = 6,
206 MacAddress = 11,
207 Ipv4 = 12,
208 Ipv6 = 13,
209 Vlan = 20,
210 InfiniBand = 9,
211 Uart = 14,
212 Vendor = 10,
213 _,
214 };
215};
216
217pub const MediaDevicePath = union(Subtype) {
218 HardDrive: *const HardDriveDevicePath,
219 Cdrom: *const CdromDevicePath,
220 Vendor: *const VendorDevicePath,
221 FilePath: *const FilePathDevicePath,
222 MediaProtocol: *const MediaProtocolDevicePath,
223 PiwgFirmwareFile: *const PiwgFirmwareFileDevicePath,
224 PiwgFirmwareVolume: *const PiwgFirmwareVolumeDevicePath,
225 RelativeOffsetRange: *const RelativeOffsetRangeDevicePath,
226 RamDisk: *const RamDiskDevicePath,
227
228 pub const Subtype = extern enum(u8) {
229 HardDrive = 1,
230 Cdrom = 2,
231 Vendor = 3,
232 FilePath = 4,
233 MediaProtocol = 5,
234 PiwgFirmwareFile = 6,
235 PiwgFirmwareVolume = 7,
236 RelativeOffsetRange = 8,
237 RamDisk = 9,
238 _,
239 };
240
241 pub const HardDriveDevicePath = packed struct {
242 type: DevicePathType,
243 subtype: Subtype,
244 length: u16,
245 // TODO
246 };
247
248 pub const CdromDevicePath = packed struct {
249 type: DevicePathType,
250 subtype: Subtype,
251 length: u16,
252 // TODO
253 };
254
255 pub const VendorDevicePath = packed struct {
256 type: DevicePathType,
257 subtype: Subtype,
258 length: u16,
259 // TODO
260 };
261
262 pub const FilePathDevicePath = packed struct {
263 type: DevicePathType,
264 subtype: Subtype,
265 length: u16,
266
267 pub fn getPath(self: *const FilePathDevicePath) [*:0]const u16 {
268 return @ptrCast([*:0]const u16, @alignCast(2, @ptrCast([*]const u8, self)) + @sizeOf(FilePathDevicePath));
269 }
270 };
271
272 pub const MediaProtocolDevicePath = packed struct {
273 type: DevicePathType,
274 subtype: Subtype,
275 length: u16,
276 // TODO
277 };
278
279 pub const PiwgFirmwareFileDevicePath = packed struct {
280 type: DevicePathType,
281 subtype: Subtype,
282 length: u16,
283 };
284
285 pub const PiwgFirmwareVolumeDevicePath = packed struct {
286 type: DevicePathType,
287 subtype: Subtype,
288 length: u16,
289 };
290
291 pub const RelativeOffsetRangeDevicePath = packed struct {
292 type: DevicePathType,
293 subtype: Subtype,
294 length: u16,
295 reserved: u32,
296 start: u64,
297 end: u64,
298 };
299
300 pub const RamDiskDevicePath = packed struct {
301 type: DevicePathType,
302 subtype: Subtype,
303 length: u16,
304 start: u64,
305 end: u64,
306 disk_type: uefi.Guid,
307 instance: u16,
308 };
309};
310
311pub const BiosBootSpecificationDevicePath = union(Subtype) {
312 BBS101: *const BBS101DevicePath,
313
314 pub const Subtype = extern enum(u8) {
315 BBS101 = 1,
316 _,
317 };
318
319 pub const BBS101DevicePath = packed struct {
320 type: DevicePathType,
321 subtype: Subtype,
322 length: u16,
323 device_type: u16,
324 status_flag: u16,
325
326 pub fn getDescription(self: *const BBS101DevicePath) [*:0]const u8 {
327 return @ptrCast([*:0]const u8, self) + @sizeOf(BBS101DevicePath);
328 }
329 };
330};
331
332pub const EndDevicePath = union(Subtype) {
333 EndEntire: *const EndEntireDevicePath,
334 EndThisInstance: *const EndThisInstanceDevicePath,
335
336 pub const Subtype = extern enum(u8) {
337 EndEntire = 0xff,
338 EndThisInstance = 0x01,
339 _,
340 };
341
342 pub const EndEntireDevicePath = packed struct {
343 type: DevicePathType,
344 subtype: Subtype,
345 length: u16,
346 };
347
348 pub const EndThisInstanceDevicePath = packed struct {
349 type: DevicePathType,
350 subtype: Subtype,
351 length: u16,
352 };
17353};
lib/std/os/uefi/protocols/edid_override_protocol.zig+3-2
......@@ -1,14 +1,15 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33const Handle = uefi.Handle;
4const Status = uefi.Status;
45
56/// Override EDID information
67pub const EdidOverrideProtocol = extern struct {
7 _get_edid: extern fn (*const EdidOverrideProtocol, Handle, *u32, *usize, *?[*]u8) usize,
8 _get_edid: extern fn (*const EdidOverrideProtocol, Handle, *u32, *usize, *?[*]u8) Status,
89
910 /// Returns policy information and potentially a replacement EDID for the specified video output device.
1011 /// attributes must be align(4)
11 pub fn getEdid(self: *const EdidOverrideProtocol, handle: Handle, attributes: *EdidOverrideProtocolAttributes, edid_size: *usize, edid: *?[*]u8) usize {
12 pub fn getEdid(self: *const EdidOverrideProtocol, handle: Handle, attributes: *EdidOverrideProtocolAttributes, edid_size: *usize, edid: *?[*]u8) Status {
1213 return self._get_edid(self, handle, attributes, edid_size, edid);
1314 }
1415
lib/std/os/uefi/protocols/file_protocol.zig+21-17
......@@ -1,47 +1,48 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33const Time = uefi.Time;
4const Status = uefi.Status;
45
56pub const FileProtocol = extern struct {
67 revision: u64,
7 _open: extern fn (*const FileProtocol, **const FileProtocol, *u16, u64, u64) usize,
8 _close: extern fn (*const FileProtocol) usize,
9 _delete: extern fn (*const FileProtocol) usize,
10 _read: extern fn (*const FileProtocol, *usize, *c_void) usize,
11 _write: extern fn (*const FileProtocol, *usize, *c_void) usize,
12 _get_info: extern fn (*const FileProtocol, *Guid, *usize, *c_void) usize,
13 _set_info: extern fn (*const FileProtocol, *Guid, usize, *c_void) usize,
14 _flush: extern fn (*const FileProtocol) usize,
8 _open: extern fn (*const FileProtocol, **const FileProtocol, [*:0]const u16, u64, u64) Status,
9 _close: extern fn (*const FileProtocol) Status,
10 _delete: extern fn (*const FileProtocol) Status,
11 _read: extern fn (*const FileProtocol, *usize, [*]u8) Status,
12 _write: extern fn (*const FileProtocol, *usize, [*]const u8) Status,
13 _get_info: extern fn (*const FileProtocol, *Guid, *usize, *c_void) Status,
14 _set_info: extern fn (*const FileProtocol, *Guid, usize, *const c_void) Status,
15 _flush: extern fn (*const FileProtocol) Status,
1516
16 pub fn open(self: *const FileProtocol, new_handle: **const FileProtocol, file_name: *u16, open_mode: u64, attributes: u64) usize {
17 pub fn open(self: *const FileProtocol, new_handle: **const FileProtocol, file_name: [*:0]const u16, open_mode: u64, attributes: u64) Status {
1718 return self._open(self, new_handle, file_name, open_mode, attributes);
1819 }
1920
20 pub fn close(self: *const FileProtocol) usize {
21 pub fn close(self: *const FileProtocol) Status {
2122 return self._close(self);
2223 }
2324
24 pub fn delete(self: *const FileProtocol) usize {
25 pub fn delete(self: *const FileProtocol) Status {
2526 return self._delete(self);
2627 }
2728
28 pub fn read(self: *const FileProtocol, buffer_size: *usize, buffer: *c_void) usize {
29 pub fn read(self: *const FileProtocol, buffer_size: *usize, buffer: [*]u8) Status {
2930 return self._read(self, buffer_size, buffer);
3031 }
3132
32 pub fn write(self: *const FileProtocol, buffer_size: *usize, buffer: *c_void) usize {
33 pub fn write(self: *const FileProtocol, buffer_size: *usize, buffer: [*]const u8) Status {
3334 return self._write(self, buffer_size, buffer);
3435 }
3536
36 pub fn get_info(self: *const FileProtocol, information_type: *Guid, buffer_size: *usize, buffer: *c_void) usize {
37 pub fn get_info(self: *const FileProtocol, information_type: *Guid, buffer_size: *usize, buffer: *c_void) Status {
3738 return self._get_info(self, information_type, buffer_size, buffer);
3839 }
3940
40 pub fn set_info(self: *const FileProtocol, information_type: *Guid, buffer_size: usize, buffer: *c_void) usize {
41 pub fn set_info(self: *const FileProtocol, information_type: *Guid, buffer_size: usize, buffer: *const c_void) Status {
4142 return self._set_info(self, information_type, buffer_size, buffer);
4243 }
4344
44 pub fn flush(self: *const FileProtocol) usize {
45 pub fn flush(self: *const FileProtocol) Status {
4546 return self._flush(self);
4647 }
4748
......@@ -75,7 +76,10 @@ pub const FileInfo = extern struct {
7576 last_access_time: Time,
7677 modification_time: Time,
7778 attribute: u64,
78 file_name: [100:0]u16,
79
80 pub fn getFileName(self: *const FileInfo) [*:0]const u16 {
81 return @ptrCast([*:0]const u16, @ptrCast([*]const u8, self) + @sizeOf(FileInfo));
82 }
7983
8084 pub const efi_file_read_only: u64 = 0x0000000000000001;
8185 pub const efi_file_hidden: u64 = 0x0000000000000002;
lib/std/os/uefi/protocols/graphics_output_protocol.zig+7-6
......@@ -1,25 +1,26 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
3const Status = uefi.Status;
34
45/// Graphics output
56pub const GraphicsOutputProtocol = extern struct {
6 _query_mode: extern fn (*const GraphicsOutputProtocol, u32, *usize, **GraphicsOutputModeInformation) usize,
7 _set_mode: extern fn (*const GraphicsOutputProtocol, u32) usize,
8 _blt: extern fn (*const GraphicsOutputProtocol, ?[*]GraphicsOutputBltPixel, GraphicsOutputBltOperation, usize, usize, usize, usize, usize, usize, usize) usize,
7 _query_mode: extern fn (*const GraphicsOutputProtocol, u32, *usize, **GraphicsOutputModeInformation) Status,
8 _set_mode: extern fn (*const GraphicsOutputProtocol, u32) Status,
9 _blt: extern fn (*const GraphicsOutputProtocol, ?[*]GraphicsOutputBltPixel, GraphicsOutputBltOperation, usize, usize, usize, usize, usize, usize, usize) Status,
910 mode: *GraphicsOutputProtocolMode,
1011
1112 /// Returns information for an available graphics mode that the graphics device and the set of active video output devices supports.
12 pub fn queryMode(self: *const GraphicsOutputProtocol, mode: u32, size_of_info: *usize, info: **GraphicsOutputModeInformation) usize {
13 pub fn queryMode(self: *const GraphicsOutputProtocol, mode: u32, size_of_info: *usize, info: **GraphicsOutputModeInformation) Status {
1314 return self._query_mode(self, mode, size_of_info, info);
1415 }
1516
1617 /// Set the video device into the specified mode and clears the visible portions of the output display to black.
17 pub fn setMode(self: *const GraphicsOutputProtocol, mode: u32) usize {
18 pub fn setMode(self: *const GraphicsOutputProtocol, mode: u32) Status {
1819 return self._set_mode(self, mode);
1920 }
2021
2122 /// Blt a rectangle of pixels on the graphics screen. Blt stands for BLock Transfer.
22 pub fn blt(self: *const GraphicsOutputProtocol, blt_buffer: ?[*]GraphicsOutputBltPixel, blt_operation: GraphicsOutputBltOperation, source_x: usize, source_y: usize, destination_x: usize, destination_y: usize, width: usize, height: usize, delta: usize) usize {
23 pub fn blt(self: *const GraphicsOutputProtocol, blt_buffer: ?[*]GraphicsOutputBltPixel, blt_operation: GraphicsOutputBltOperation, source_x: usize, source_y: usize, destination_x: usize, destination_y: usize, width: usize, height: usize, delta: usize) Status {
2324 return self._blt(self, blt_buffer, blt_operation, source_x, source_y, destination_x, destination_y, width, height, delta);
2425 }
2526
lib/std/os/uefi/protocols/hii_database_protocol.zig+16-15
......@@ -1,38 +1,39 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
3const Status = uefi.Status;
34const hii = uefi.protocols.hii;
45
56/// Database manager for HII-related data structures.
67pub const HIIDatabaseProtocol = extern struct {
7 _new_package_list: usize, // TODO
8 _remove_package_list: extern fn (*const HIIDatabaseProtocol, hii.HIIHandle) usize,
9 _update_package_list: extern fn (*const HIIDatabaseProtocol, hii.HIIHandle, *const hii.HIIPackageList) usize,
10 _list_package_lists: extern fn (*const HIIDatabaseProtocol, u8, ?*const Guid, *usize, [*]hii.HIIHandle) usize,
11 _export_package_lists: extern fn (*const HIIDatabaseProtocol, ?hii.HIIHandle, *usize, *hii.HIIPackageList) usize,
12 _register_package_notify: usize, // TODO
13 _unregister_package_notify: usize, // TODO
14 _find_keyboard_layouts: usize, // TODO
15 _get_keyboard_layout: usize, // TODO
16 _set_keyboard_layout: usize, // TODO
17 _get_package_list_handle: usize, // TODO
8 _new_package_list: Status, // TODO
9 _remove_package_list: extern fn (*const HIIDatabaseProtocol, hii.HIIHandle) Status,
10 _update_package_list: extern fn (*const HIIDatabaseProtocol, hii.HIIHandle, *const hii.HIIPackageList) Status,
11 _list_package_lists: extern fn (*const HIIDatabaseProtocol, u8, ?*const Guid, *usize, [*]hii.HIIHandle) Status,
12 _export_package_lists: extern fn (*const HIIDatabaseProtocol, ?hii.HIIHandle, *usize, *hii.HIIPackageList) Status,
13 _register_package_notify: Status, // TODO
14 _unregister_package_notify: Status, // TODO
15 _find_keyboard_layouts: Status, // TODO
16 _get_keyboard_layout: Status, // TODO
17 _set_keyboard_layout: Status, // TODO
18 _get_package_list_handle: Status, // TODO
1819
1920 /// Removes a package list from the HII database.
20 pub fn removePackageList(self: *const HIIDatabaseProtocol, handle: hii.HIIHandle) usize {
21 pub fn removePackageList(self: *const HIIDatabaseProtocol, handle: hii.HIIHandle) Status {
2122 return self._remove_package_list(self, handle);
2223 }
2324
2425 /// Update a package list in the HII database.
25 pub fn updatePackageList(self: *const HIIDatabaseProtocol, handle: hii.HIIHandle, buffer: *const hii.HIIPackageList) usize {
26 pub fn updatePackageList(self: *const HIIDatabaseProtocol, handle: hii.HIIHandle, buffer: *const hii.HIIPackageList) Status {
2627 return self._update_package_list(self, handle, buffer);
2728 }
2829
2930 /// Determines the handles that are currently active in the database.
30 pub fn listPackageLists(self: *const HIIDatabaseProtocol, package_type: u8, package_guid: ?*const Guid, buffer_length: *usize, handles: [*]hii.HIIHandle) usize {
31 pub fn listPackageLists(self: *const HIIDatabaseProtocol, package_type: u8, package_guid: ?*const Guid, buffer_length: *usize, handles: [*]hii.HIIHandle) Status {
3132 return self._list_package_lists(self, package_type, package_guid, buffer_length, handles);
3233 }
3334
3435 /// Exports the contents of one or all package lists in the HII database into a buffer.
35 pub fn exportPackageLists(self: *const HIIDatabaseProtocol, handle: ?hii.HIIHandle, buffer_size: *usize, buffer: *hii.HIIPackageList) usize {
36 pub fn exportPackageLists(self: *const HIIDatabaseProtocol, handle: ?hii.HIIHandle, buffer_size: *usize, buffer: *hii.HIIPackageList) Status {
3637 return self._export_package_lists(self, handle, buffer_size, buffer);
3738 }
3839
lib/std/os/uefi/protocols/hii_popup_protocol.zig+3-2
......@@ -1,14 +1,15 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
3const Status = uefi.Status;
34const hii = uefi.protocols.hii;
45
56/// Display a popup window
67pub const HIIPopupProtocol = extern struct {
78 revision: u64,
8 _create_popup: extern fn (*const HIIPopupProtocol, HIIPopupStyle, HIIPopupType, hii.HIIHandle, u16, ?*HIIPopupSelection) usize,
9 _create_popup: extern fn (*const HIIPopupProtocol, HIIPopupStyle, HIIPopupType, hii.HIIHandle, u16, ?*HIIPopupSelection) Status,
910
1011 /// Displays a popup window.
11 pub fn createPopup(self: *const HIIPopupProtocol, style: HIIPopupStyle, popup_type: HIIPopupType, handle: hii.HIIHandle, msg: u16, user_selection: ?*HIIPopupSelection) usize {
12 pub fn createPopup(self: *const HIIPopupProtocol, style: HIIPopupStyle, popup_type: HIIPopupType, handle: hii.HIIHandle, msg: u16, user_selection: ?*HIIPopupSelection) Status {
1213 return self._create_popup(self, style, popup_type, handle, msg, user_selection);
1314 }
1415
lib/std/os/uefi/protocols/ip6_config_protocol.zig+9-8
......@@ -1,26 +1,27 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33const Event = uefi.Event;
4const Status = uefi.Status;
45
56pub const Ip6ConfigProtocol = extern struct {
6 _set_data: extern fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, usize, *const c_void) usize,
7 _get_data: extern fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, *usize, ?*const c_void) usize,
8 _register_data_notify: extern fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, Event) usize,
9 _unregister_data_notify: extern fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, Event) usize,
7 _set_data: extern fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, usize, *const c_void) Status,
8 _get_data: extern fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, *usize, ?*const c_void) Status,
9 _register_data_notify: extern fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, Event) Status,
10 _unregister_data_notify: extern fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, Event) Status,
1011
11 pub fn setData(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, data_size: usize, data: *const c_void) usize {
12 pub fn setData(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, data_size: usize, data: *const c_void) Status {
1213 return self._set_data(self, data_type, data_size, data);
1314 }
1415
15 pub fn getData(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, data_size: *usize, data: ?*const c_void) usize {
16 pub fn getData(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, data_size: *usize, data: ?*const c_void) Status {
1617 return self._get_data(self, data_type, data_size, data);
1718 }
1819
19 pub fn registerDataNotify(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, event: Event) usize {
20 pub fn registerDataNotify(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, event: Event) Status {
2021 return self._register_data_notify(self, data_type, event);
2122 }
2223
23 pub fn unregisterDataNotify(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, event: Event) usize {
24 pub fn unregisterDataNotify(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, event: Event) Status {
2425 return self._unregister_data_notify(self, data_type, event);
2526 }
2627
lib/std/os/uefi/protocols/ip6_protocol.zig+20-19
......@@ -1,63 +1,64 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33const Event = uefi.Event;
4const Status = uefi.Status;
45const MacAddress = uefi.protocols.MacAddress;
56const ManagedNetworkConfigData = uefi.protocols.ManagedNetworkConfigData;
67const SimpleNetworkMode = uefi.protocols.SimpleNetworkMode;
78
89pub const Ip6Protocol = extern struct {
9 _get_mode_data: extern fn (*const Ip6Protocol, ?*Ip6ModeData, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) usize,
10 _configure: extern fn (*const Ip6Protocol, ?*const Ip6ConfigData) usize,
11 _groups: extern fn (*const Ip6Protocol, bool, ?*const Ip6Address) usize,
12 _routes: extern fn (*const Ip6Protocol, bool, ?*const Ip6Address, u8, ?*const Ip6Address) usize,
13 _neighbors: extern fn (*const Ip6Protocol, bool, *const Ip6Address, ?*const MacAddress, u32, bool) usize,
14 _transmit: extern fn (*const Ip6Protocol, *Ip6CompletionToken) usize,
15 _receive: extern fn (*const Ip6Protocol, *Ip6CompletionToken) usize,
16 _cancel: extern fn (*const Ip6Protocol, ?*Ip6CompletionToken) usize,
17 _poll: extern fn (*const Ip6Protocol) usize,
10 _get_mode_data: extern fn (*const Ip6Protocol, ?*Ip6ModeData, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) Status,
11 _configure: extern fn (*const Ip6Protocol, ?*const Ip6ConfigData) Status,
12 _groups: extern fn (*const Ip6Protocol, bool, ?*const Ip6Address) Status,
13 _routes: extern fn (*const Ip6Protocol, bool, ?*const Ip6Address, u8, ?*const Ip6Address) Status,
14 _neighbors: extern fn (*const Ip6Protocol, bool, *const Ip6Address, ?*const MacAddress, u32, bool) Status,
15 _transmit: extern fn (*const Ip6Protocol, *Ip6CompletionToken) Status,
16 _receive: extern fn (*const Ip6Protocol, *Ip6CompletionToken) Status,
17 _cancel: extern fn (*const Ip6Protocol, ?*Ip6CompletionToken) Status,
18 _poll: extern fn (*const Ip6Protocol) Status,
1819
1920 /// Gets the current operational settings for this instance of the EFI IPv6 Protocol driver.
20 pub fn getModeData(self: *const Ip6Protocol, ip6_mode_data: ?*Ip6ModeData, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetworkMode) usize {
21 pub fn getModeData(self: *const Ip6Protocol, ip6_mode_data: ?*Ip6ModeData, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetworkMode) Status {
2122 return self._get_mode_data(self, ip6_mode_data, mnp_config_data, snp_mode_data);
2223 }
2324
2425 /// Assign IPv6 address and other configuration parameter to this EFI IPv6 Protocol driver instance.
25 pub fn configure(self: *const Ip6Protocol, ip6_config_data: ?*const Ip6ConfigData) usize {
26 pub fn configure(self: *const Ip6Protocol, ip6_config_data: ?*const Ip6ConfigData) Status {
2627 return self._configure(self, ip6_config_data);
2728 }
2829
2930 /// Joins and leaves multicast groups.
30 pub fn groups(self: *const Ip6Protocol, join_flag: bool, group_address: ?*const Ip6Address) usize {
31 pub fn groups(self: *const Ip6Protocol, join_flag: bool, group_address: ?*const Ip6Address) Status {
3132 return self._groups(self, join_flag, group_address);
3233 }
3334
3435 /// Adds and deletes routing table entries.
35 pub fn routes(self: *const Ip6Protocol, delete_route: bool, destination: ?*const Ip6Address, prefix_length: u8, gateway_address: ?*const Ip6Address) usize {
36 pub fn routes(self: *const Ip6Protocol, delete_route: bool, destination: ?*const Ip6Address, prefix_length: u8, gateway_address: ?*const Ip6Address) Status {
3637 return self._routes(self, delete_route, destination, prefix_length, gateway_address);
3738 }
3839
3940 /// Add or delete Neighbor cache entries.
40 pub fn neighbors(self: *const Ip6Protocol, delete_flag: bool, target_ip6_address: *const Ip6Address, target_link_address: ?*const MacAddress, timeout: u32, override: bool) usize {
41 pub fn neighbors(self: *const Ip6Protocol, delete_flag: bool, target_ip6_address: *const Ip6Address, target_link_address: ?*const MacAddress, timeout: u32, override: bool) Status {
4142 return self._neighbors(self, delete_flag, target_ip6_address, target_link_address, timeout, override);
4243 }
4344
4445 /// Places outgoing data packets into the transmit queue.
45 pub fn transmit(self: *const Ip6Protocol, token: *Ip6CompletionToken) usize {
46 pub fn transmit(self: *const Ip6Protocol, token: *Ip6CompletionToken) Status {
4647 return self._transmit(self, token);
4748 }
4849
4950 /// Places a receiving request into the receiving queue.
50 pub fn receive(self: *const Ip6Protocol, token: *Ip6CompletionToken) usize {
51 pub fn receive(self: *const Ip6Protocol, token: *Ip6CompletionToken) Status {
5152 return self._receive(self, token);
5253 }
5354
5455 /// Abort an asynchronous transmits or receive request.
55 pub fn cancel(self: *const Ip6Protocol, token: ?*Ip6CompletionToken) usize {
56 pub fn cancel(self: *const Ip6Protocol, token: ?*Ip6CompletionToken) Status {
5657 return self._cancel(self, token);
5758 }
5859
5960 /// Polls for incoming data packets and processes outgoing data packets.
60 pub fn poll(self: *const Ip6Protocol) usize {
61 pub fn poll(self: *const Ip6Protocol) Status {
6162 return self._poll(self);
6263 }
6364
......@@ -138,6 +139,6 @@ pub const Ip6IcmpType = extern struct {
138139
139140pub const Ip6CompletionToken = extern struct {
140141 event: Event,
141 status: usize,
142 status: Status,
142143 packet: *c_void, // union TODO
143144};
lib/std/os/uefi/protocols/ip6_service_binding_protocol.zig+5-4
......@@ -1,16 +1,17 @@
11const uefi = @import("std").os.uefi;
22const Handle = uefi.Handle;
33const Guid = uefi.Guid;
4const Status = uefi.Status;
45
56pub const Ip6ServiceBindingProtocol = extern struct {
6 _create_child: extern fn (*const Ip6ServiceBindingProtocol, *?Handle) usize,
7 _destroy_child: extern fn (*const Ip6ServiceBindingProtocol, Handle) usize,
7 _create_child: extern fn (*const Ip6ServiceBindingProtocol, *?Handle) Status,
8 _destroy_child: extern fn (*const Ip6ServiceBindingProtocol, Handle) Status,
89
9 pub fn createChild(self: *const Ip6ServiceBindingProtocol, handle: *?Handle) usize {
10 pub fn createChild(self: *const Ip6ServiceBindingProtocol, handle: *?Handle) Status {
1011 return self._create_child(self, handle);
1112 }
1213
13 pub fn destroyChild(self: *const Ip6ServiceBindingProtocol, handle: Handle) usize {
14 pub fn destroyChild(self: *const Ip6ServiceBindingProtocol, handle: Handle) Status {
1415 return self._destroy_child(self, handle);
1516 }
1617
lib/std/os/uefi/protocols/loaded_image_protocol.zig+13-3
......@@ -1,6 +1,7 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33const Handle = uefi.Handle;
4const Status = uefi.Status;
45const SystemTable = uefi.tables.SystemTable;
56const MemoryType = uefi.tables.MemoryType;
67const DevicePathProtocol = uefi.protocols.DevicePathProtocol;
......@@ -13,15 +14,15 @@ pub const LoadedImageProtocol = extern struct {
1314 file_path: *DevicePathProtocol,
1415 reserved: *c_void,
1516 load_options_size: u32,
16 load_options: *c_void,
17 load_options: ?*c_void,
1718 image_base: [*]u8,
1819 image_size: u64,
1920 image_code_type: MemoryType,
2021 image_data_type: MemoryType,
21 _unload: extern fn (*const LoadedImageProtocol, Handle) usize,
22 _unload: extern fn (*const LoadedImageProtocol, Handle) Status,
2223
2324 /// Unloads an image from memory.
24 pub fn unload(self: *const LoadedImageProtocol, handle: Handle) usize {
25 pub fn unload(self: *const LoadedImageProtocol, handle: Handle) Status {
2526 return self._unload(self, handle);
2627 }
2728
......@@ -34,3 +35,12 @@ pub const LoadedImageProtocol = extern struct {
3435 .node = [_]u8{ 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b },
3536 };
3637};
38
39pub const loaded_image_device_path_protocol_guid align(8) = Guid{
40 .time_low = 0xbc62157e,
41 .time_mid = 0x3e33,
42 .time_high_and_version = 0x4fec,
43 .clock_seq_high_and_reserved = 0x99,
44 .clock_seq_low = 0x20,
45 .node = [_]u8{ 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf },
46};
lib/std/os/uefi/protocols/managed_network_protocol.zig+17-16
......@@ -1,60 +1,61 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33const Event = uefi.Event;
4const Status = uefi.Status;
45const Time = uefi.Time;
56const SimpleNetworkMode = uefi.protocols.SimpleNetworkMode;
67const MacAddress = uefi.protocols.MacAddress;
78
89pub const ManagedNetworkProtocol = extern struct {
9 _get_mode_data: extern fn (*const ManagedNetworkProtocol, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) usize,
10 _configure: extern fn (*const ManagedNetworkProtocol, ?*const ManagedNetworkConfigData) usize,
11 _mcast_ip_to_mac: extern fn (*const ManagedNetworkProtocol, bool, *const c_void, *MacAddress) usize,
12 _groups: extern fn (*const ManagedNetworkProtocol, bool, ?*const MacAddress) usize,
13 _transmit: extern fn (*const ManagedNetworkProtocol, *const ManagedNetworkCompletionToken) usize,
14 _receive: extern fn (*const ManagedNetworkProtocol, *const ManagedNetworkCompletionToken) usize,
15 _cancel: extern fn (*const ManagedNetworkProtocol, ?*const ManagedNetworkCompletionToken) usize,
10 _get_mode_data: extern fn (*const ManagedNetworkProtocol, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) Status,
11 _configure: extern fn (*const ManagedNetworkProtocol, ?*const ManagedNetworkConfigData) Status,
12 _mcast_ip_to_mac: extern fn (*const ManagedNetworkProtocol, bool, *const c_void, *MacAddress) Status,
13 _groups: extern fn (*const ManagedNetworkProtocol, bool, ?*const MacAddress) Status,
14 _transmit: extern fn (*const ManagedNetworkProtocol, *const ManagedNetworkCompletionToken) Status,
15 _receive: extern fn (*const ManagedNetworkProtocol, *const ManagedNetworkCompletionToken) Status,
16 _cancel: extern fn (*const ManagedNetworkProtocol, ?*const ManagedNetworkCompletionToken) Status,
1617 _poll: extern fn (*const ManagedNetworkProtocol) usize,
1718
1819 /// Returns the operational parameters for the current MNP child driver.
1920 /// May also support returning the underlying SNP driver mode data.
20 pub fn getModeData(self: *const ManagedNetworkProtocol, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetworkMode) usize {
21 pub fn getModeData(self: *const ManagedNetworkProtocol, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetworkMode) Status {
2122 return self._get_mode_data(self, mnp_config_data, snp_mode_data);
2223 }
2324
2425 /// Sets or clears the operational parameters for the MNP child driver.
25 pub fn configure(self: *const ManagedNetworkProtocol, mnp_config_data: ?*const ManagedNetworkConfigData) usize {
26 pub fn configure(self: *const ManagedNetworkProtocol, mnp_config_data: ?*const ManagedNetworkConfigData) Status {
2627 return self._configure(self, mnp_config_data);
2728 }
2829
2930 /// Translates an IP multicast address to a hardware (MAC) multicast address.
3031 /// This function may be unsupported in some MNP implementations.
31 pub fn mcastIpToMac(self: *const ManagedNetworkProtocol, ipv6flag: bool, ipaddress: *const c_void, mac_address: *MacAddress) usize {
32 pub fn mcastIpToMac(self: *const ManagedNetworkProtocol, ipv6flag: bool, ipaddress: *const c_void, mac_address: *MacAddress) Status {
3233 return self._mcast_ip_to_mac(self, ipv6flag, ipaddress);
3334 }
3435
3536 /// Enables and disables receive filters for multicast address.
3637 /// This function may be unsupported in some MNP implementations.
37 pub fn groups(self: *const ManagedNetworkProtocol, join_flag: bool, mac_address: ?*const MacAddress) usiz {
38 pub fn groups(self: *const ManagedNetworkProtocol, join_flag: bool, mac_address: ?*const MacAddress) Status {
3839 return self._groups(self, join_flag, mac_address);
3940 }
4041
4142 /// Places asynchronous outgoing data packets into the transmit queue.
42 pub fn transmit(self: *const ManagedNetworkProtocol, token: *const ManagedNetworkCompletionToken) usize {
43 pub fn transmit(self: *const ManagedNetworkProtocol, token: *const ManagedNetworkCompletionToken) Status {
4344 return self._transmit(self, token);
4445 }
4546
4647 /// Places an asynchronous receiving request into the receiving queue.
47 pub fn receive(self: *const ManagedNetworkProtocol, token: *const ManagedNetworkCompletionToken) usize {
48 pub fn receive(self: *const ManagedNetworkProtocol, token: *const ManagedNetworkCompletionToken) Status {
4849 return self._receive(self, token);
4950 }
5051
5152 /// Aborts an asynchronous transmit or receive request.
52 pub fn cancel(self: *const ManagedNetworkProtocol, token: ?*const ManagedNetworkCompletionToken) usize {
53 pub fn cancel(self: *const ManagedNetworkProtocol, token: ?*const ManagedNetworkCompletionToken) Status {
5354 return self._cancel(self, token);
5455 }
5556
5657 /// Polls for incoming data packets and processes outgoing data packets.
57 pub fn poll(self: *const ManagedNetworkProtocol) usize {
58 pub fn poll(self: *const ManagedNetworkProtocol) Status {
5859 return self._poll(self);
5960 }
6061
......@@ -83,7 +84,7 @@ pub const ManagedNetworkConfigData = extern struct {
8384
8485pub const ManagedNetworkCompletionToken = extern struct {
8586 event: Event,
86 status: usize,
87 status: Status,
8788 packet: extern union {
8889 RxData: *ManagedNetworkReceiveData,
8990 TxData: *ManagedNetworkTransmitData,
lib/std/os/uefi/protocols/managed_network_service_binding_protocol.zig+5-4
......@@ -1,16 +1,17 @@
11const uefi = @import("std").os.uefi;
22const Handle = uefi.Handle;
33const Guid = uefi.Guid;
4const Status = uefi.Status;
45
56pub const ManagedNetworkServiceBindingProtocol = extern struct {
6 _create_child: extern fn (*const ManagedNetworkServiceBindingProtocol, *?Handle) usize,
7 _destroy_child: extern fn (*const ManagedNetworkServiceBindingProtocol, Handle) usize,
7 _create_child: extern fn (*const ManagedNetworkServiceBindingProtocol, *?Handle) Status,
8 _destroy_child: extern fn (*const ManagedNetworkServiceBindingProtocol, Handle) Status,
89
9 pub fn createChild(self: *const ManagedNetworkServiceBindingProtocol, handle: *?Handle) usize {
10 pub fn createChild(self: *const ManagedNetworkServiceBindingProtocol, handle: *?Handle) Status {
1011 return self._create_child(self, handle);
1112 }
1213
13 pub fn destroyChild(self: *const ManagedNetworkServiceBindingProtocol, handle: Handle) usize {
14 pub fn destroyChild(self: *const ManagedNetworkServiceBindingProtocol, handle: Handle) Status {
1415 return self._destroy_child(self, handle);
1516 }
1617
lib/std/os/uefi/protocols/rng_protocol.zig+5-4
......@@ -1,18 +1,19 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
3const Status = uefi.Status;
34
45/// Random Number Generator protocol
56pub const RNGProtocol = extern struct {
6 _get_info: extern fn (*const RNGProtocol, *usize, [*]align(8) Guid) usize,
7 _get_rng: extern fn (*const RNGProtocol, ?*align(8) const Guid, usize, [*]u8) usize,
7 _get_info: extern fn (*const RNGProtocol, *usize, [*]align(8) Guid) Status,
8 _get_rng: extern fn (*const RNGProtocol, ?*align(8) const Guid, usize, [*]u8) Status,
89
910 /// Returns information about the random number generation implementation.
10 pub fn getInfo(self: *const RNGProtocol, list_size: *usize, list: [*]align(8) Guid) usize {
11 pub fn getInfo(self: *const RNGProtocol, list_size: *usize, list: [*]align(8) Guid) Status {
1112 return self._get_info(self, list_size, list);
1213 }
1314
1415 /// Produces and returns an RNG value using either the default or specified RNG algorithm.
15 pub fn getRNG(self: *const RNGProtocol, algo: ?*align(8) const Guid, value_length: usize, value: [*]u8) usize {
16 pub fn getRNG(self: *const RNGProtocol, algo: ?*align(8) const Guid, value_length: usize, value: [*]u8) Status {
1617 return self._get_rng(self, algo, value_length, value);
1718 }
1819
lib/std/os/uefi/protocols/shell_parameters_protocol.zig created+20
......@@ -0,0 +1,20 @@
1const uefi = @import("std").os.uefi;
2const Guid = uefi.Guid;
3const FileHandle = uefi.FileHandle;
4
5pub const ShellParametersProtocol = extern struct {
6 argv: [*][*:0]const u16,
7 argc: usize,
8 stdin: FileHandle,
9 stdout: FileHandle,
10 stderr: FileHandle,
11
12 pub const guid align(8) = Guid{
13 .time_low = 0x752f3136,
14 .time_mid = 0x4e16,
15 .time_high_and_version = 0x4fdc,
16 .clock_seq_high_and_reserved = 0xa2,
17 .clock_seq_low = 0x2a,
18 .node = [_]u8{ 0xe5, 0xf4, 0x68, 0x12, 0xf4, 0xca },
19 };
20};
lib/std/os/uefi/protocols/simple_file_system_protocol.zig+4-3
......@@ -1,12 +1,13 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33const FileProtocol = uefi.protocols.FileProtocol;
4const Status = uefi.Status;
45
5const SimpleFileSystemProtocol = extern struct {
6pub const SimpleFileSystemProtocol = extern struct {
67 revision: u64,
7 _open_volume: extern fn (*const SimpleFileSystemProtocol, **const FileProtocol) usize,
8 _open_volume: extern fn (*const SimpleFileSystemProtocol, **const FileProtocol) Status,
89
9 pub fn openVolume(self: *const SimpleFileSystemProtocol, root: **const FileProtocol) usize {
10 pub fn openVolume(self: *const SimpleFileSystemProtocol, root: **const FileProtocol) Status {
1011 return self._open_volume(self, root);
1112 }
1213
lib/std/os/uefi/protocols/simple_network_protocol.zig+27-26
......@@ -1,87 +1,88 @@
11const uefi = @import("std").os.uefi;
22const Event = uefi.Event;
33const Guid = uefi.Guid;
4const Status = uefi.Status;
45
56pub const SimpleNetworkProtocol = extern struct {
67 revision: u64,
7 _start: extern fn (*const SimpleNetworkProtocol) usize,
8 _stop: extern fn (*const SimpleNetworkProtocol) usize,
9 _initialize: extern fn (*const SimpleNetworkProtocol, usize, usize) usize,
10 _reset: extern fn (*const SimpleNetworkProtocol, bool) usize,
11 _shutdown: extern fn (*const SimpleNetworkProtocol) usize,
12 _receive_filters: extern fn (*const SimpleNetworkProtocol, SimpleNetworkReceiveFilter, SimpleNetworkReceiveFilter, bool, usize, ?[*]const MacAddress) usize,
13 _station_address: extern fn (*const SimpleNetworkProtocol, bool, ?*const MacAddress) usize,
14 _statistics: extern fn (*const SimpleNetworkProtocol, bool, ?*usize, ?*NetworkStatistics) usize,
15 _mcast_ip_to_mac: extern fn (*const SimpleNetworkProtocol, bool, *const c_void, *MacAddress) usize,
16 _nvdata: extern fn (*const SimpleNetworkProtocol, bool, usize, usize, [*]u8) usize,
17 _get_status: extern fn (*const SimpleNetworkProtocol, *SimpleNetworkInterruptStatus, ?*?[*]u8) usize,
18 _transmit: extern fn (*const SimpleNetworkProtocol, usize, usize, [*]const u8, ?*const MacAddress, ?*const MacAddress, ?*const u16) usize,
19 _receive: extern fn (*const SimpleNetworkProtocol, ?*usize, *usize, [*]u8, ?*MacAddress, ?*MacAddress, ?*u16) usize,
8 _start: extern fn (*const SimpleNetworkProtocol) Status,
9 _stop: extern fn (*const SimpleNetworkProtocol) Status,
10 _initialize: extern fn (*const SimpleNetworkProtocol, usize, usize) Status,
11 _reset: extern fn (*const SimpleNetworkProtocol, bool) Status,
12 _shutdown: extern fn (*const SimpleNetworkProtocol) Status,
13 _receive_filters: extern fn (*const SimpleNetworkProtocol, SimpleNetworkReceiveFilter, SimpleNetworkReceiveFilter, bool, usize, ?[*]const MacAddress) Status,
14 _station_address: extern fn (*const SimpleNetworkProtocol, bool, ?*const MacAddress) Status,
15 _statistics: extern fn (*const SimpleNetworkProtocol, bool, ?*usize, ?*NetworkStatistics) Status,
16 _mcast_ip_to_mac: extern fn (*const SimpleNetworkProtocol, bool, *const c_void, *MacAddress) Status,
17 _nvdata: extern fn (*const SimpleNetworkProtocol, bool, usize, usize, [*]u8) Status,
18 _get_status: extern fn (*const SimpleNetworkProtocol, *SimpleNetworkInterruptStatus, ?*?[*]u8) Status,
19 _transmit: extern fn (*const SimpleNetworkProtocol, usize, usize, [*]const u8, ?*const MacAddress, ?*const MacAddress, ?*const u16) Status,
20 _receive: extern fn (*const SimpleNetworkProtocol, ?*usize, *usize, [*]u8, ?*MacAddress, ?*MacAddress, ?*u16) Status,
2021 wait_for_packet: Event,
2122 mode: *SimpleNetworkMode,
2223
2324 /// Changes the state of a network interface from "stopped" to "started".
24 pub fn start(self: *const SimpleNetworkProtocol) usize {
25 pub fn start(self: *const SimpleNetworkProtocol) Status {
2526 return self._start(self);
2627 }
2728
2829 /// Changes the state of a network interface from "started" to "stopped".
29 pub fn stop(self: *const SimpleNetworkProtocol) usize {
30 pub fn stop(self: *const SimpleNetworkProtocol) Status {
3031 return self._stop(self);
3132 }
3233
3334 /// Resets a network adapter and allocates the transmit and receive buffers required by the network interface.
34 pub fn initialize(self: *const SimpleNetworkProtocol, extra_rx_buffer_size: usize, extra_tx_buffer_size: usize) usize {
35 pub fn initialize(self: *const SimpleNetworkProtocol, extra_rx_buffer_size: usize, extra_tx_buffer_size: usize) Status {
3536 return self._initialize(self, extra_rx_buffer_size, extra_tx_buffer_size);
3637 }
3738
3839 /// Resets a network adapter and reinitializes it with the parameters that were provided in the previous call to initialize().
39 pub fn reset(self: *const SimpleNetworkProtocol, extended_verification: bool) usize {
40 pub fn reset(self: *const SimpleNetworkProtocol, extended_verification: bool) Status {
4041 return self._reset(self, extended_verification);
4142 }
4243
4344 /// Resets a network adapter and leaves it in a state that is safe for another driver to initialize.
44 pub fn shutdown(self: *const SimpleNetworkProtocol) usize {
45 pub fn shutdown(self: *const SimpleNetworkProtocol) Status {
4546 return self._shutdown(self);
4647 }
4748
4849 /// Manages the multicast receive filters of a network interface.
49 pub fn receiveFilters(self: *const SimpleNetworkProtocol, enable: SimpleNetworkReceiveFilter, disable: SimpleNetworkReceiveFilter, reset_mcast_filter: bool, mcast_filter_cnt: usize, mcast_filter: ?[*]const MacAddress) usize {
50 pub fn receiveFilters(self: *const SimpleNetworkProtocol, enable: SimpleNetworkReceiveFilter, disable: SimpleNetworkReceiveFilter, reset_mcast_filter: bool, mcast_filter_cnt: usize, mcast_filter: ?[*]const MacAddress) Status {
5051 return self._receive_filters(self, enable, disable, reset_mcast_filter, mcast_filter_cnt, mcast_filter);
5152 }
5253
5354 /// Modifies or resets the current station address, if supported.
54 pub fn stationAddress(self: *const SimpleNetworkProtocol, reset: bool, new: ?*const MacAddress) usize {
55 pub fn stationAddress(self: *const SimpleNetworkProtocol, reset: bool, new: ?*const MacAddress) Status {
5556 return self._station_address(self, reset, new);
5657 }
5758
5859 /// Resets or collects the statistics on a network interface.
59 pub fn statistics(self: *const SimpleNetworkProtocol, reset_: bool, statistics_size: ?*usize, statistics_table: ?*NetworkStatistics) usize {
60 pub fn statistics(self: *const SimpleNetworkProtocol, reset_: bool, statistics_size: ?*usize, statistics_table: ?*NetworkStatistics) Status {
6061 return self._statistics(self, reset_, statistics_size, statistics_table);
6162 }
6263
6364 /// Converts a multicast IP address to a multicast HW MAC address.
64 pub fn mcastIpToMac(self: *const SimpleNetworkProtocol, ipv6: bool, ip: *const c_void, mac: *MacAddress) usize {
65 pub fn mcastIpToMac(self: *const SimpleNetworkProtocol, ipv6: bool, ip: *const c_void, mac: *MacAddress) Status {
6566 return self._mcast_ip_to_mac(self, ipv6, ip, mac);
6667 }
6768
6869 /// Performs read and write operations on the NVRAM device attached to a network interface.
69 pub fn nvdata(self: *const SimpleNetworkProtocol, read_write: bool, offset: usize, buffer_size: usize, buffer: [*]u8) usize {
70 pub fn nvdata(self: *const SimpleNetworkProtocol, read_write: bool, offset: usize, buffer_size: usize, buffer: [*]u8) Status {
7071 return self._nvdata(self, read_write, offset, buffer_size, buffer);
7172 }
7273
7374 /// Reads the current interrupt status and recycled transmit buffer status from a network interface.
74 pub fn getStatus(self: *const SimpleNetworkProtocol, interrupt_status: *SimpleNetworkInterruptStatus, tx_buf: ?*?[*]u8) usize {
75 pub fn getStatus(self: *const SimpleNetworkProtocol, interrupt_status: *SimpleNetworkInterruptStatus, tx_buf: ?*?[*]u8) Status {
7576 return self._get_status(self, interrupt_status, tx_buf);
7677 }
7778
7879 /// Places a packet in the transmit queue of a network interface.
79 pub fn transmit(self: *const SimpleNetworkProtocol, header_size: usize, buffer_size: usize, buffer: [*]const u8, src_addr: ?*const MacAddress, dest_addr: ?*const MacAddress, protocol: ?*const u16) usize {
80 pub fn transmit(self: *const SimpleNetworkProtocol, header_size: usize, buffer_size: usize, buffer: [*]const u8, src_addr: ?*const MacAddress, dest_addr: ?*const MacAddress, protocol: ?*const u16) Status {
8081 return self._transmit(self, header_size, buffer_size, buffer, src_addr, dest_addr, protocol);
8182 }
8283
8384 /// Receives a packet from a network interface.
84 pub fn receive(self: *const SimpleNetworkProtocol, header_size: ?*usize, buffer_size: *usize, buffer: [*]u8, src_addr: ?*MacAddress, dest_addr: ?*MacAddress, protocol: ?*u16) usize {
85 pub fn receive(self: *const SimpleNetworkProtocol, header_size: ?*usize, buffer_size: *usize, buffer: [*]u8, src_addr: ?*MacAddress, dest_addr: ?*MacAddress, protocol: ?*u16) Status {
8586 return self._receive(self, header_size, buffer_size, buffer, src_addr, dest_addr, protocol);
8687 }
8788
lib/std/os/uefi/protocols/simple_pointer_protocol.zig+5-4
......@@ -1,21 +1,22 @@
11const uefi = @import("std").os.uefi;
22const Event = uefi.Event;
33const Guid = uefi.Guid;
4const Status = uefi.Status;
45
56/// Protocol for mice
67pub const SimplePointerProtocol = struct {
7 _reset: extern fn (*const SimplePointerProtocol, bool) usize,
8 _get_state: extern fn (*const SimplePointerProtocol, *SimplePointerState) usize,
8 _reset: extern fn (*const SimplePointerProtocol, bool) Status,
9 _get_state: extern fn (*const SimplePointerProtocol, *SimplePointerState) Status,
910 wait_for_input: Event,
1011 mode: *SimplePointerMode,
1112
1213 /// Resets the pointer device hardware.
13 pub fn reset(self: *const SimplePointerProtocol, verify: bool) usize {
14 pub fn reset(self: *const SimplePointerProtocol, verify: bool) Status {
1415 return self._reset(self, verify);
1516 }
1617
1718 /// Retrieves the current state of a pointer device.
18 pub fn getState(self: *const SimplePointerProtocol, state: *SimplePointerState) usize {
19 pub fn getState(self: *const SimplePointerProtocol, state: *SimplePointerState) Status {
1920 return self._get_state(self, state);
2021 }
2122
lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig+11-10
......@@ -1,38 +1,39 @@
11const uefi = @import("std").os.uefi;
22const Event = uefi.Event;
33const Guid = uefi.Guid;
4const Status = uefi.Status;
45
56/// Character input devices, e.g. Keyboard
67pub const SimpleTextInputExProtocol = extern struct {
7 _reset: extern fn (*const SimpleTextInputExProtocol, bool) usize,
8 _read_key_stroke_ex: extern fn (*const SimpleTextInputExProtocol, *KeyData) usize,
8 _reset: extern fn (*const SimpleTextInputExProtocol, bool) Status,
9 _read_key_stroke_ex: extern fn (*const SimpleTextInputExProtocol, *KeyData) Status,
910 wait_for_key_ex: Event,
10 _set_state: extern fn (*const SimpleTextInputExProtocol, *const u8) usize,
11 _register_key_notify: extern fn (*const SimpleTextInputExProtocol, *const KeyData, extern fn (*const KeyData) usize, **c_void) usize,
12 _unregister_key_notify: extern fn (*const SimpleTextInputExProtocol, *const c_void) usize,
11 _set_state: extern fn (*const SimpleTextInputExProtocol, *const u8) Status,
12 _register_key_notify: extern fn (*const SimpleTextInputExProtocol, *const KeyData, extern fn (*const KeyData) usize, **c_void) Status,
13 _unregister_key_notify: extern fn (*const SimpleTextInputExProtocol, *const c_void) Status,
1314
1415 /// Resets the input device hardware.
15 pub fn reset(self: *const SimpleTextInputExProtocol, verify: bool) usize {
16 pub fn reset(self: *const SimpleTextInputExProtocol, verify: bool) Status {
1617 return self._reset(self, verify);
1718 }
1819
1920 /// Reads the next keystroke from the input device.
20 pub fn readKeyStrokeEx(self: *const SimpleTextInputExProtocol, key_data: *KeyData) usize {
21 pub fn readKeyStrokeEx(self: *const SimpleTextInputExProtocol, key_data: *KeyData) Status {
2122 return self._read_key_stroke_ex(self, key_data);
2223 }
2324
2425 /// Set certain state for the input device.
25 pub fn setState(self: *const SimpleTextInputExProtocol, state: *const u8) usize {
26 pub fn setState(self: *const SimpleTextInputExProtocol, state: *const u8) Status {
2627 return self._set_state(self, state);
2728 }
2829
2930 /// Register a notification function for a particular keystroke for the input device.
30 pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: extern fn (*const KeyData) usize, handle: **c_void) usize {
31 pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: extern fn (*const KeyData) usize, handle: **c_void) Status {
3132 return self._register_key_notify(self, key_data, notify, handle);
3233 }
3334
3435 /// Remove the notification that was previously registered.
35 pub fn unregisterKeyNotify(self: *const SimpleTextInputExProtocol, handle: *const c_void) usize {
36 pub fn unregisterKeyNotify(self: *const SimpleTextInputExProtocol, handle: *const c_void) Status {
3637 return self._unregister_key_notify(self, handle);
3738 }
3839
lib/std/os/uefi/protocols/simple_text_input_protocol.zig+4-3
......@@ -2,20 +2,21 @@ const uefi = @import("std").os.uefi;
22const Event = uefi.Event;
33const Guid = uefi.Guid;
44const InputKey = uefi.protocols.InputKey;
5const Status = uefi.Status;
56
67/// Character input devices, e.g. Keyboard
78pub const SimpleTextInputProtocol = extern struct {
89 _reset: extern fn (*const SimpleTextInputProtocol, bool) usize,
9 _read_key_stroke: extern fn (*const SimpleTextInputProtocol, *InputKey) usize,
10 _read_key_stroke: extern fn (*const SimpleTextInputProtocol, *InputKey) Status,
1011 wait_for_key: Event,
1112
1213 /// Resets the input device hardware.
13 pub fn reset(self: *const SimpleTextInputProtocol, verify: bool) usize {
14 pub fn reset(self: *const SimpleTextInputProtocol, verify: bool) Status {
1415 return self._reset(self, verify);
1516 }
1617
1718 /// Reads the next keystroke from the input device.
18 pub fn readKeyStroke(self: *const SimpleTextInputProtocol, input_key: *InputKey) usize {
19 pub fn readKeyStroke(self: *const SimpleTextInputProtocol, input_key: *InputKey) Status {
1920 return self._read_key_stroke(self, input_key);
2021 }
2122
lib/std/os/uefi/protocols/simple_text_output_protocol.zig+19-18
......@@ -1,61 +1,62 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
3const Status = uefi.Status;
34
45/// Character output devices
56pub const SimpleTextOutputProtocol = extern struct {
6 _reset: extern fn (*const SimpleTextOutputProtocol, bool) usize,
7 _output_string: extern fn (*const SimpleTextOutputProtocol, [*:0]const u16) usize,
8 _test_string: extern fn (*const SimpleTextOutputProtocol, [*:0]const u16) usize,
9 _query_mode: extern fn (*const SimpleTextOutputProtocol, usize, *usize, *usize) usize,
10 _set_mode: extern fn (*const SimpleTextOutputProtocol, usize) usize,
11 _set_attribute: extern fn (*const SimpleTextOutputProtocol, usize) usize,
12 _clear_screen: extern fn (*const SimpleTextOutputProtocol) usize,
13 _set_cursor_position: extern fn (*const SimpleTextOutputProtocol, usize, usize) usize,
14 _enable_cursor: extern fn (*const SimpleTextOutputProtocol, bool) usize,
7 _reset: extern fn (*const SimpleTextOutputProtocol, bool) Status,
8 _output_string: extern fn (*const SimpleTextOutputProtocol, [*:0]const u16) Status,
9 _test_string: extern fn (*const SimpleTextOutputProtocol, [*:0]const u16) Status,
10 _query_mode: extern fn (*const SimpleTextOutputProtocol, usize, *usize, *usize) Status,
11 _set_mode: extern fn (*const SimpleTextOutputProtocol, usize) Status,
12 _set_attribute: extern fn (*const SimpleTextOutputProtocol, usize) Status,
13 _clear_screen: extern fn (*const SimpleTextOutputProtocol) Status,
14 _set_cursor_position: extern fn (*const SimpleTextOutputProtocol, usize, usize) Status,
15 _enable_cursor: extern fn (*const SimpleTextOutputProtocol, bool) Status,
1516 mode: *SimpleTextOutputMode,
1617
1718 /// Resets the text output device hardware.
18 pub fn reset(self: *const SimpleTextOutputProtocol, verify: bool) usize {
19 pub fn reset(self: *const SimpleTextOutputProtocol, verify: bool) Status {
1920 return self._reset(self, verify);
2021 }
2122
2223 /// Writes a string to the output device.
23 pub fn outputString(self: *const SimpleTextOutputProtocol, msg: [*:0]const u16) usize {
24 pub fn outputString(self: *const SimpleTextOutputProtocol, msg: [*:0]const u16) Status {
2425 return self._output_string(self, msg);
2526 }
2627
2728 /// Verifies that all characters in a string can be output to the target device.
28 pub fn testString(self: *const SimpleTextOutputProtocol, msg: [*:0]const u16) usize {
29 pub fn testString(self: *const SimpleTextOutputProtocol, msg: [*:0]const u16) Status {
2930 return self._test_string(self, msg);
3031 }
3132
3233 /// Returns information for an available text mode that the output device(s) supports.
33 pub fn queryMode(self: *const SimpleTextOutputProtocol, mode_number: usize, columns: *usize, rows: *usize) usize {
34 pub fn queryMode(self: *const SimpleTextOutputProtocol, mode_number: usize, columns: *usize, rows: *usize) Status {
3435 return self._query_mode(self, mode_number, columns, rows);
3536 }
3637
3738 /// Sets the output device(s) to a specified mode.
38 pub fn setMode(self: *const SimpleTextOutputProtocol, mode_number: usize) usize {
39 pub fn setMode(self: *const SimpleTextOutputProtocol, mode_number: usize) Status {
3940 return self._set_mode(self, mode_number);
4041 }
4142
4243 /// Sets the background and foreground colors for the outputString() and clearScreen() functions.
43 pub fn setAttribute(self: *const SimpleTextOutputProtocol, attribute: usize) usize {
44 pub fn setAttribute(self: *const SimpleTextOutputProtocol, attribute: usize) Status {
4445 return self._set_attribute(self, attribute);
4546 }
4647
4748 /// Clears the output device(s) display to the currently selected background color.
48 pub fn clearScreen(self: *const SimpleTextOutputProtocol) usize {
49 pub fn clearScreen(self: *const SimpleTextOutputProtocol) Status {
4950 return self._clear_screen(self);
5051 }
5152
5253 /// Sets the current coordinates of the cursor position.
53 pub fn setCursorPosition(self: *const SimpleTextOutputProtocol, column: usize, row: usize) usize {
54 pub fn setCursorPosition(self: *const SimpleTextOutputProtocol, column: usize, row: usize) Status {
5455 return self._set_cursor_position(self, column, row);
5556 }
5657
5758 /// Makes the cursor visible or invisible.
58 pub fn enableCursor(self: *const SimpleTextOutputProtocol, visible: bool) usize {
59 pub fn enableCursor(self: *const SimpleTextOutputProtocol, visible: bool) Status {
5960 return self._enable_cursor(self, visible);
6061 }
6162
lib/std/os/uefi/protocols/udp6_protocol.zig+17-16
......@@ -1,6 +1,7 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33const Event = uefi.Event;
4const Status = uefi.Status;
45const Time = uefi.Time;
56const Ip6ModeData = uefi.protocols.Ip6ModeData;
67const Ip6Address = uefi.protocols.Ip6Address;
......@@ -8,39 +9,39 @@ const ManagedNetworkConfigData = uefi.protocols.ManagedNetworkConfigData;
89const SimpleNetworkMode = uefi.protocols.SimpleNetworkMode;
910
1011pub const Udp6Protocol = extern struct {
11 _get_mode_data: extern fn (*const Udp6Protocol, ?*Udp6ConfigData, ?*Ip6ModeData, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) usize,
12 _configure: extern fn (*const Udp6Protocol, ?*const Udp6ConfigData) usize,
13 _groups: extern fn (*const Udp6Protocol, bool, ?*const Ip6Address) usize,
14 _transmit: extern fn (*const Udp6Protocol, *Udp6CompletionToken) usize,
15 _receive: extern fn (*const Udp6Protocol, *Udp6CompletionToken) usize,
16 _cancel: extern fn (*const Udp6Protocol, ?*Udp6CompletionToken) usize,
17 _poll: extern fn (*const Udp6Protocol) usize,
18
19 pub fn getModeData(self: *const Udp6Protocol, udp6_config_data: ?*Udp6ConfigData, ip6_mode_data: ?*Ip6ModeData, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetworkMode) usize {
12 _get_mode_data: extern fn (*const Udp6Protocol, ?*Udp6ConfigData, ?*Ip6ModeData, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) Status,
13 _configure: extern fn (*const Udp6Protocol, ?*const Udp6ConfigData) Status,
14 _groups: extern fn (*const Udp6Protocol, bool, ?*const Ip6Address) Status,
15 _transmit: extern fn (*const Udp6Protocol, *Udp6CompletionToken) Status,
16 _receive: extern fn (*const Udp6Protocol, *Udp6CompletionToken) Status,
17 _cancel: extern fn (*const Udp6Protocol, ?*Udp6CompletionToken) Status,
18 _poll: extern fn (*const Udp6Protocol) Status,
19
20 pub fn getModeData(self: *const Udp6Protocol, udp6_config_data: ?*Udp6ConfigData, ip6_mode_data: ?*Ip6ModeData, mnp_config_data: ?*ManagedNetworkConfigData, snp_mode_data: ?*SimpleNetworkMode) Status {
2021 return self._get_mode_data(self, udp6_config_data, ip6_mode_data, mnp_config_data, snp_mode_data);
2122 }
2223
23 pub fn configure(self: *const Udp6Protocol, udp6_config_data: ?*const Udp6ConfigData) usize {
24 pub fn configure(self: *const Udp6Protocol, udp6_config_data: ?*const Udp6ConfigData) Status {
2425 return self._configure(self, udp6_config_data);
2526 }
2627
27 pub fn groups(self: *const Udp6Protocol, join_flag: bool, multicast_address: ?*const Ip6Address) usize {
28 pub fn groups(self: *const Udp6Protocol, join_flag: bool, multicast_address: ?*const Ip6Address) Status {
2829 return self._groups(self, join_flag, multicast_address);
2930 }
3031
31 pub fn transmit(self: *const Udp6Protocol, token: *Udp6CompletionToken) usize {
32 pub fn transmit(self: *const Udp6Protocol, token: *Udp6CompletionToken) Status {
3233 return self._transmit(self, token);
3334 }
3435
35 pub fn receive(self: *const Udp6Protocol, token: *Udp6CompletionToken) usize {
36 pub fn receive(self: *const Udp6Protocol, token: *Udp6CompletionToken) Status {
3637 return self._receive(self, token);
3738 }
3839
39 pub fn cancel(self: *const Udp6Protocol, token: ?*Udp6CompletionToken) usize {
40 pub fn cancel(self: *const Udp6Protocol, token: ?*Udp6CompletionToken) Status {
4041 return self._cancel(self, token);
4142 }
4243
43 pub fn poll(self: *const Udp6Protocol) usize {
44 pub fn poll(self: *const Udp6Protocol) Status {
4445 return self._poll(self);
4546 }
4647
......@@ -70,7 +71,7 @@ pub const Udp6ConfigData = extern struct {
7071
7172pub const Udp6CompletionToken = extern struct {
7273 event: Event,
73 status: usize,
74 Status: usize,
7475 packet: extern union {
7576 RxData: *Udp6ReceiveData,
7677 TxData: *Udp6TransmitData,
lib/std/os/uefi/protocols/udp6_service_binding_protocol.zig+5-4
......@@ -1,16 +1,17 @@
11const uefi = @import("std").os.uefi;
22const Handle = uefi.Handle;
33const Guid = uefi.Guid;
4const Status = uefi.Status;
45
56pub const Udp6ServiceBindingProtocol = extern struct {
6 _create_child: extern fn (*const Udp6ServiceBindingProtocol, *?Handle) usize,
7 _destroy_child: extern fn (*const Udp6ServiceBindingProtocol, Handle) usize,
7 _create_child: extern fn (*const Udp6ServiceBindingProtocol, *?Handle) Status,
8 _destroy_child: extern fn (*const Udp6ServiceBindingProtocol, Handle) Status,
89
9 pub fn createChild(self: *const Udp6ServiceBindingProtocol, handle: *?Handle) usize {
10 pub fn createChild(self: *const Udp6ServiceBindingProtocol, handle: *?Handle) Status {
1011 return self._create_child(self, handle);
1112 }
1213
13 pub fn destroyChild(self: *const Udp6ServiceBindingProtocol, handle: Handle) usize {
14 pub fn destroyChild(self: *const Udp6ServiceBindingProtocol, handle: Handle) Status {
1415 return self._destroy_child(self, handle);
1516 }
1617
lib/std/os/uefi/status.zig+100-82
......@@ -1,124 +1,142 @@
11const high_bit = 1 << @typeInfo(usize).Int.bits - 1;
22
3/// The operation completed successfully.
4pub const success: usize = 0;
3pub const Status = extern enum(usize) {
4 /// The operation completed successfully.
5 Success = 0,
56
6/// The image failed to load.
7pub const load_error: usize = high_bit | 1;
7 /// The image failed to load.
8 LoadError = high_bit | 1,
89
9/// A parameter was incorrect.
10pub const invalid_parameter: usize = high_bit | 2;
10 /// A parameter was incorrect.
11 InvalidParameter = high_bit | 2,
1112
12/// The operation is not supported.
13pub const unsupported: usize = high_bit | 3;
13 /// The operation is not supported.
14 Unsupported = high_bit | 3,
1415
15/// The buffer was not the proper size for the request.
16pub const bad_buffer_size: usize = high_bit | 4;
16 /// The buffer was not the proper size for the request.
17 BadBufferSize = high_bit | 4,
1718
18/// The buffer is not large enough to hold the requested data. The required buffer size is returned in the appropriate parameter when this error occurs.
19pub const buffer_too_small: usize = high_bit | 5;
19 /// The buffer is not large enough to hold the requested data. The required buffer size is returned in the appropriate parameter when this error occurs.
20 BufferTooSmall = high_bit | 5,
2021
21/// There is no data pending upon return.
22pub const not_ready: usize = high_bit | 6;
22 /// There is no data pending upon return.
23 NotReady = high_bit | 6,
2324
24/// The physical device reported an error while attempting the operation.
25pub const device_error: usize = high_bit | 7;
25 /// The physical device reported an error while attempting the operation.
26 DeviceError = high_bit | 7,
2627
27/// The device cannot be written to.
28pub const write_protected: usize = high_bit | 8;
28 /// The device cannot be written to.
29 WriteProtected = high_bit | 8,
2930
30/// A resource has run out.
31pub const out_of_resources: usize = high_bit | 9;
31 /// A resource has run out.
32 OutOfResources = high_bit | 9,
3233
33/// An inconstancy was detected on the file system causing the operating to fail.
34pub const volume_corrupted: usize = high_bit | 10;
34 /// An inconstancy was detected on the file system causing the operating to fail.
35 VolumeCorrupted = high_bit | 10,
3536
36/// There is no more space on the file system.
37pub const volume_full: usize = high_bit | 11;
37 /// There is no more space on the file system.
38 VolumeFull = high_bit | 11,
3839
39/// The device does not contain any medium to perform the operation.
40pub const no_media: usize = high_bit | 12;
40 /// The device does not contain any medium to perform the operation.
41 NoMedia = high_bit | 12,
4142
42/// The medium in the device has changed since the last access.
43pub const media_changed: usize = high_bit | 13;
43 /// The medium in the device has changed since the last access.
44 MediaChanged = high_bit | 13,
4445
45/// The item was not found.
46pub const not_found: usize = high_bit | 14;
46 /// The item was not found.
47 NotFound = high_bit | 14,
4748
48/// Access was denied.
49pub const access_denied: usize = high_bit | 15;
49 /// Access was denied.
50 AccessDenied = high_bit | 15,
5051
51/// The server was not found or did not respond to the request.
52pub const no_response: usize = high_bit | 16;
52 /// The server was not found or did not respond to the request.
53 NoResponse = high_bit | 16,
5354
54/// A mapping to a device does not exist.
55pub const no_mapping: usize = high_bit | 17;
55 /// A mapping to a device does not exist.
56 NoMapping = high_bit | 17,
5657
57/// The timeout time expired.
58pub const timeout: usize = high_bit | 18;
58 /// The timeout time expired.
59 Timeout = high_bit | 18,
5960
60/// The protocol has not been started.
61pub const not_started: usize = high_bit | 19;
61 /// The protocol has not been started.
62 NotStarted = high_bit | 19,
6263
63/// The protocol has already been started.
64pub const already_started: usize = high_bit | 20;
64 /// The protocol has already been started.
65 AlreadyStarted = high_bit | 20,
6566
66/// The operation was aborted.
67pub const aborted: usize = high_bit | 21;
67 /// The operation was aborted.
68 Aborted = high_bit | 21,
6869
69/// An ICMP error occurred during the network operation.
70pub const icmp_error: usize = high_bit | 22;
70 /// An ICMP error occurred during the network operation.
71 IcmpError = high_bit | 22,
7172
72/// A TFTP error occurred during the network operation.
73pub const tftp_error: usize = high_bit | 23;
73 /// A TFTP error occurred during the network operation.
74 TftpError = high_bit | 23,
7475
75/// A protocol error occurred during the network operation.
76pub const protocol_error: usize = high_bit | 24;
76 /// A protocol error occurred during the network operation.
77 ProtocolError = high_bit | 24,
7778
78/// The function encountered an internal version that was incompatible with a version requested by the caller.
79pub const incompatible_version: usize = high_bit | 25;
79 /// The function encountered an internal version that was incompatible with a version requested by the caller.
80 IncompatibleVersion = high_bit | 25,
8081
81/// The function was not performed due to a security violation.
82pub const security_violation: usize = high_bit | 26;
82 /// The function was not performed due to a security violation.
83 SecurityViolation = high_bit | 26,
8384
84/// A CRC error was detected.
85pub const crc_error: usize = high_bit | 27;
85 /// A CRC error was detected.
86 CrcError = high_bit | 27,
8687
87/// Beginning or end of media was reached
88pub const end_of_media: usize = high_bit | 28;
88 /// Beginning or end of media was reached
89 EndOfMedia = high_bit | 28,
8990
90/// The end of the file was reached.
91pub const end_of_file: usize = high_bit | 31;
91 /// The end of the file was reached.
92 EndOfFile = high_bit | 31,
9293
93/// The language specified was invalid.
94pub const invalid_language: usize = high_bit | 32;
94 /// The language specified was invalid.
95 InvalidLanguage = high_bit | 32,
9596
96/// The security status of the data is unknown or compromised and the data must be updated or replaced to restore a valid security status.
97pub const compromised_data: usize = high_bit | 33;
97 /// The security status of the data is unknown or compromised and the data must be updated or replaced to restore a valid security status.
98 CompromisedData = high_bit | 33,
9899
99/// There is an address conflict address allocation
100pub const ip_address_conflict: usize = high_bit | 34;
100 /// There is an address conflict address allocation
101 IpAddressConflict = high_bit | 34,
101102
102/// A HTTP error occurred during the network operation.
103pub const http_error: usize = high_bit | 35;
103 /// A HTTP error occurred during the network operation.
104 HttpError = high_bit | 35,
104105
105/// The string contained one or more characters that the device could not render and were skipped.
106pub const warn_unknown_glyph: usize = 1;
106 NetworkUnreachable = high_bit | 100,
107107
108/// The handle was closed, but the file was not deleted.
109pub const warn_delete_failure: usize = 2;
108 HostUnreachable = high_bit | 101,
110109
111/// The handle was closed, but the data to the file was not flushed properly.
112pub const warn_write_failure: usize = 3;
110 ProtocolUnreachable = high_bit | 102,
113111
114/// The resulting buffer was too small, and the data was truncated to the buffer size.
115pub const warn_buffer_too_small: usize = 4;
112 PortUnreachable = high_bit | 103,
116113
117/// The data has not been updated within the timeframe set by localpolicy for this type of data.
118pub const warn_stale_data: usize = 5;
114 ConnectionFin = high_bit | 104,
119115
120/// The resulting buffer contains UEFI-compliant file system.
121pub const warn_file_system: usize = 6;
116 ConnectionReset = high_bit | 105,
122117
123/// The operation will be processed across a system reset.
124pub const warn_reset_required: usize = 7;
118 ConnectionRefused = high_bit | 106,
119
120 /// The string contained one or more characters that the device could not render and were skipped.
121 WarnUnknownGlyph = 1,
122
123 /// The handle was closed, but the file was not deleted.
124 WarnDeleteFailure = 2,
125
126 /// The handle was closed, but the data to the file was not flushed properly.
127 WarnWriteFailure = 3,
128
129 /// The resulting buffer was too small, and the data was truncated to the buffer size.
130 WarnBufferTooSmall = 4,
131
132 /// The data has not been updated within the timeframe set by localpolicy for this type of data.
133 WarnStaleData = 5,
134
135 /// The resulting buffer contains UEFI-compliant file system.
136 WarnFileSystem = 6,
137
138 /// The operation will be processed across a system reset.
139 WarnResetRequired = 7,
140
141 _,
142};
lib/std/os/uefi/tables.zig+1
......@@ -1,3 +1,4 @@
1pub const AllocateType = @import("tables/boot_services.zig").AllocateType;
12pub const BootServices = @import("tables/boot_services.zig").BootServices;
23pub const ConfigurationTable = @import("tables/configuration_table.zig").ConfigurationTable;
34pub const global_variable align(8) = @import("tables/runtime_services.zig").global_variable;
lib/std/os/uefi/tables/boot_services.zig+76-50
......@@ -2,6 +2,7 @@ const uefi = @import("std").os.uefi;
22const Event = uefi.Event;
33const Guid = uefi.Guid;
44const Handle = uefi.Handle;
5const Status = uefi.Status;
56const TableHeader = uefi.tables.TableHeader;
67const DevicePathProtocol = uefi.protocols.DevicePathProtocol;
78
......@@ -19,101 +20,120 @@ const DevicePathProtocol = uefi.protocols.DevicePathProtocol;
1920pub const BootServices = extern struct {
2021 hdr: TableHeader,
2122
22 raiseTpl: usize, // TODO
23 restoreTpl: usize, // TODO
24 allocatePages: usize, // TODO
25 freePages: usize, // TODO
23 /// Raises a task's priority level and returns its previous level.
24 raiseTpl: extern fn (usize) usize,
25
26 /// Restores a task's priority level to its previous value.
27 restoreTpl: extern fn (usize) void,
28
29 /// Allocates memory pages from the system.
30 allocatePages: extern fn (AllocateType, MemoryType, usize, *[*]align(4096) u8) Status,
31
32 /// Frees memory pages.
33 freePages: extern fn ([*]align(4096) u8, usize) Status,
2634
2735 /// Returns the current memory map.
28 getMemoryMap: extern fn (*usize, [*]MemoryDescriptor, *usize, *usize, *u32) usize,
36 getMemoryMap: extern fn (*usize, [*]MemoryDescriptor, *usize, *usize, *u32) Status,
2937
3038 /// Allocates pool memory.
31 allocatePool: extern fn (MemoryType, usize, *align(8) [*]u8) usize,
39 allocatePool: extern fn (MemoryType, usize, *[*]align(8) u8) Status,
3240
3341 /// Returns pool memory to the system.
34 freePool: extern fn ([*]align(8) u8) usize,
42 freePool: extern fn ([*]align(8) u8) Status,
3543
3644 /// Creates an event.
37 createEvent: extern fn (u32, usize, ?extern fn (Event, ?*c_void) void, ?*const c_void, *Event) usize,
45 createEvent: extern fn (u32, usize, ?extern fn (Event, ?*c_void) void, ?*const c_void, *Event) Status,
3846
3947 /// Sets the type of timer and the trigger time for a timer event.
40 setTimer: extern fn (Event, TimerDelay, u64) usize,
48 setTimer: extern fn (Event, TimerDelay, u64) Status,
4149
4250 /// Stops execution until an event is signaled.
43 waitForEvent: extern fn (usize, [*]const Event, *usize) usize,
51 waitForEvent: extern fn (usize, [*]const Event, *usize) Status,
4452
4553 /// Signals an event.
46 signalEvent: extern fn (Event) usize,
54 signalEvent: extern fn (Event) Status,
4755
4856 /// Closes an event.
49 closeEvent: extern fn (Event) usize,
57 closeEvent: extern fn (Event) Status,
5058
5159 /// Checks whether an event is in the signaled state.
52 checkEvent: extern fn (Event) usize,
60 checkEvent: extern fn (Event) Status,
5361
54 installProtocolInterface: usize, // TODO
55 reinstallProtocolInterface: usize, // TODO
56 uninstallProtocolInterface: usize, // TODO
62 installProtocolInterface: Status, // TODO
63 reinstallProtocolInterface: Status, // TODO
64 uninstallProtocolInterface: Status, // TODO
5765
5866 /// Queries a handle to determine if it supports a specified protocol.
59 handleProtocol: extern fn (Handle, *align(8) const Guid, *?*c_void) usize,
67 handleProtocol: extern fn (Handle, *align(8) const Guid, *?*c_void) Status,
6068
6169 reserved: *c_void,
6270
63 registerProtocolNotify: usize, // TODO
64 locateHandle: usize, // TODO
65 locateDevicePath: usize, // TODO
66 installConfigurationTable: usize, // TODO
71 registerProtocolNotify: Status, // TODO
72
73 /// Returns an array of handles that support a specified protocol.
74 locateHandle: extern fn (LocateSearchType, ?*align(8) const Guid, ?*const c_void, *usize, [*]Handle) Status,
75
76 locateDevicePath: Status, // TODO
77 installConfigurationTable: Status, // TODO
6778
6879 /// Loads an EFI image into memory.
69 loadImage: extern fn (bool, Handle, ?*const DevicePathProtocol, ?[*]const u8, usize, *?Handle) usize,
80 loadImage: extern fn (bool, Handle, ?*const DevicePathProtocol, ?[*]const u8, usize, *?Handle) Status,
7081
7182 /// Transfers control to a loaded image's entry point.
72 startImage: extern fn (Handle, ?*usize, ?*[*]u16) usize,
83 startImage: extern fn (Handle, ?*usize, ?*[*]u16) Status,
7384
7485 /// Terminates a loaded EFI image and returns control to boot services.
75 exit: extern fn (Handle, usize, usize, ?*const c_void) usize,
86 exit: extern fn (Handle, Status, usize, ?*const c_void) Status,
7687
7788 /// Unloads an image.
78 unloadImage: extern fn (Handle) usize,
89 unloadImage: extern fn (Handle) Status,
7990
8091 /// Terminates all boot services.
81 exitBootServices: extern fn (Handle, usize) usize,
92 exitBootServices: extern fn (Handle, usize) Status,
8293
83 getNextMonotonicCount: usize, // TODO
94 /// Returns a monotonically increasing count for the platform.
95 getNextMonotonicCount: extern fn (*u64) Status,
8496
8597 /// Induces a fine-grained stall.
86 stall: extern fn (usize) usize,
98 stall: extern fn (usize) Status,
8799
88100 /// Sets the system's watchdog timer.
89 setWatchdogTimer: extern fn (usize, u64, usize, ?[*]const u16) usize,
101 setWatchdogTimer: extern fn (usize, u64, usize, ?[*]const u16) Status,
90102
91 connectController: usize, // TODO
92 disconnectController: usize, // TODO
103 connectController: Status, // TODO
104 disconnectController: Status, // TODO
93105
94106 /// Queries a handle to determine if it supports a specified protocol.
95 openProtocol: extern fn (Handle, *align(8) const Guid, *?*c_void, ?Handle, ?Handle, OpenProtocolAttributes) usize,
107 openProtocol: extern fn (Handle, *align(8) const Guid, *?*c_void, ?Handle, ?Handle, OpenProtocolAttributes) Status,
96108
97109 /// Closes a protocol on a handle that was opened using openProtocol().
98 closeProtocol: extern fn (Handle, *align(8) const Guid, Handle, ?Handle) usize,
110 closeProtocol: extern fn (Handle, *align(8) const Guid, Handle, ?Handle) Status,
99111
100112 /// Retrieves the list of agents that currently have a protocol interface opened.
101 openProtocolInformation: extern fn (Handle, *align(8) const Guid, *[*]ProtocolInformationEntry, *usize) usize,
113 openProtocolInformation: extern fn (Handle, *align(8) const Guid, *[*]ProtocolInformationEntry, *usize) Status,
102114
103 protocolsPerHandle: usize, // TODO
115 /// Retrieves the list of protocol interface GUIDs that are installed on a handle in a buffer allocated from pool.
116 protocolsPerHandle: extern fn (Handle, *[*]*align(8) const Guid, *usize) Status,
104117
105118 /// Returns an array of handles that support the requested protocol in a buffer allocated from pool.
106 locateHandleBuffer: extern fn (LocateSearchType, ?*align(8) const Guid, ?*const c_void, *usize, *[*]Handle) usize,
119 locateHandleBuffer: extern fn (LocateSearchType, ?*align(8) const Guid, ?*const c_void, *usize, *[*]Handle) Status,
107120
108121 /// Returns the first protocol instance that matches the given protocol.
109 locateProtocol: extern fn (*align(8) const Guid, ?*const c_void, *?*c_void) usize,
122 locateProtocol: extern fn (*align(8) const Guid, ?*const c_void, *?*c_void) Status,
123
124 installMultipleProtocolInterfaces: Status, // TODO
125 uninstallMultipleProtocolInterfaces: Status, // TODO
110126
111 installMultipleProtocolInterfaces: usize, // TODO
112 uninstallMultipleProtocolInterfaces: usize, // TODO
113 calculateCrc32: usize, // TODO
114 copyMem: usize, // TODO
115 setMem: usize, // TODO
116 createEventEx: usize, // TODO
127 /// Computes and returns a 32-bit CRC for a data buffer.
128 calculateCrc32: extern fn ([*]const u8, usize, *u32) Status,
129
130 /// Copies the contents of one buffer to another buffer
131 copyMem: extern fn ([*]u8, [*]const u8, usize) void,
132
133 /// Fills a buffer with a specified value
134 setMem: extern fn ([*]u8, usize, u8) void,
135
136 createEventEx: Status, // TODO
117137
118138 pub const signature: u64 = 0x56524553544f4f42;
119139
......@@ -187,13 +207,13 @@ pub const LocateSearchType = extern enum(u32) {
187207};
188208
189209pub const OpenProtocolAttributes = packed struct {
190 by_handle_protocol: bool,
191 get_protocol: bool,
192 test_protocol: bool,
193 by_child_controller: bool,
194 by_driver: bool,
195 exclusive: bool,
196 _pad: u26,
210 by_handle_protocol: bool = false,
211 get_protocol: bool = false,
212 test_protocol: bool = false,
213 by_child_controller: bool = false,
214 by_driver: bool = false,
215 exclusive: bool = false,
216 _pad: u26 = undefined,
197217};
198218
199219pub const ProtocolInformationEntry = extern struct {
......@@ -202,3 +222,9 @@ pub const ProtocolInformationEntry = extern struct {
202222 attributes: OpenProtocolAttributes,
203223 open_count: u32,
204224};
225
226pub const AllocateType = extern enum(u32) {
227 AllocateAnyPages,
228 AllocateMaxAddress,
229 AllocateAddress,
230};
lib/std/os/uefi/tables/runtime_services.zig+15-14
......@@ -3,6 +3,7 @@ const Guid = uefi.Guid;
33const TableHeader = uefi.tables.TableHeader;
44const Time = uefi.Time;
55const TimeCapabilities = uefi.TimeCapabilities;
6const Status = uefi.Status;
67
78/// Runtime services are provided by the firmware before and after exitBootServices has been called.
89///
......@@ -16,31 +17,31 @@ pub const RuntimeServices = extern struct {
1617 hdr: TableHeader,
1718
1819 /// Returns the current time and date information, and the time-keeping capabilities of the hardware platform.
19 getTime: extern fn (*uefi.Time, ?*TimeCapabilities) usize,
20 getTime: extern fn (*uefi.Time, ?*TimeCapabilities) Status,
2021
21 setTime: usize, // TODO
22 getWakeupTime: usize, // TODO
23 setWakeupTime: usize, // TODO
24 setVirtualAddressMap: usize, // TODO
25 convertPointer: usize, // TODO
22 setTime: Status, // TODO
23 getWakeupTime: Status, // TODO
24 setWakeupTime: Status, // TODO
25 setVirtualAddressMap: Status, // TODO
26 convertPointer: Status, // TODO
2627
2728 /// Returns the value of a variable.
28 getVariable: extern fn ([*:0]const u16, *align(8) const Guid, ?*u32, *usize, ?*c_void) usize,
29 getVariable: extern fn ([*:0]const u16, *align(8) const Guid, ?*u32, *usize, ?*c_void) Status,
2930
3031 /// Enumerates the current variable names.
31 getNextVariableName: extern fn (*usize, [*]u16, *align(8) Guid) usize,
32 getNextVariableName: extern fn (*usize, [*:0]u16, *align(8) Guid) Status,
3233
3334 /// Sets the value of a variable.
34 setVariable: extern fn ([*:0]const u16, *align(8) const Guid, u32, usize, *c_void) usize,
35 setVariable: extern fn ([*:0]const u16, *align(8) const Guid, u32, usize, *c_void) Status,
3536
36 getNextHighMonotonicCount: usize, // TODO
37 getNextHighMonotonicCount: Status, // TODO
3738
3839 /// Resets the entire platform.
39 resetSystem: extern fn (ResetType, usize, usize, ?*const c_void) noreturn,
40 resetSystem: extern fn (ResetType, Status, usize, ?*const c_void) noreturn,
4041
41 updateCapsule: usize, // TODO
42 queryCapsuleCapabilities: usize, // TODO
43 queryVariableInfo: usize, // TODO
42 updateCapsule: Status, // TODO
43 queryCapsuleCapabilities: Status, // TODO
44 queryVariableInfo: Status, // TODO
4445
4546 pub const signature: u64 = 0x56524553544e5552;
4647};
lib/std/start.zig+8-9
......@@ -55,25 +55,24 @@ fn wasm_freestanding_start() callconv(.C) void {
5555}
5656
5757fn EfiMain(handle: uefi.Handle, system_table: *uefi.tables.SystemTable) callconv(.C) usize {
58 const bad_efi_main_ret = "expected return type of main to be 'void', 'noreturn', or 'usize'";
5958 uefi.handle = handle;
6059 uefi.system_table = system_table;
6160
62 switch (@typeInfo(@TypeOf(root.main).ReturnType)) {
63 .NoReturn => {
61 switch (@TypeOf(root.main).ReturnType) {
62 noreturn => {
6463 root.main();
6564 },
66 .Void => {
65 void => {
6766 root.main();
6867 return 0;
6968 },
70 .Int => |info| {
71 if (info.bits != @typeInfo(usize).Int.bits) {
72 @compileError(bad_efi_main_ret);
73 }
69 usize => {
7470 return root.main();
7571 },
76 else => @compileError(bad_efi_main_ret),
72 uefi.Status => {
73 return @enumToInt(root.main());
74 },
75 else => @compileError("expected return type of main to be 'void', 'noreturn', 'usize', or 'std.os.uefi.Status'"),
7776 }
7877}
7978