std/os/uefi: boot services and runtime services improvements

- Several function signatures added
- Add getNextVariableName sentinel termination annotation
This commit is contained in:
Nick Erdmann 2020-03-07 22:43:20 +01:00
parent aa49f972d6
commit 7c12f93734
3 changed files with 45 additions and 19 deletions

View File

@ -1,3 +1,4 @@
pub const AllocateType = @import("tables/boot_services.zig").AllocateType;
pub const BootServices = @import("tables/boot_services.zig").BootServices;
pub const ConfigurationTable = @import("tables/configuration_table.zig").ConfigurationTable;
pub const global_variable align(8) = @import("tables/runtime_services.zig").global_variable;

View File

@ -19,16 +19,23 @@ const DevicePathProtocol = uefi.protocols.DevicePathProtocol;
pub const BootServices = extern struct {
hdr: TableHeader,
raiseTpl: usize, // TODO
restoreTpl: usize, // TODO
allocatePages: usize, // TODO
freePages: usize, // TODO
/// Raises a task's priority level and returns its previous level.
raiseTpl: extern fn (usize) usize,
/// Restores a task's priority level to its previous value.
restoreTpl: extern fn (usize) void,
/// Allocates memory pages from the system.
allocatePages: extern fn (AllocateType, MemoryType, usize, *[*]align(4096) u8) usize,
/// Frees memory pages.
freePages: extern fn ([*]align(4096) u8, usize) usize,
/// Returns the current memory map.
getMemoryMap: extern fn (*usize, [*]MemoryDescriptor, *usize, *usize, *u32) usize,
/// Allocates pool memory.
allocatePool: extern fn (MemoryType, usize, *align(8) [*]u8) usize,
allocatePool: extern fn (MemoryType, usize, *[*]align(8) u8) usize,
/// Returns pool memory to the system.
freePool: extern fn ([*]align(8) u8) usize,
@ -61,7 +68,10 @@ pub const BootServices = extern struct {
reserved: *c_void,
registerProtocolNotify: usize, // TODO
locateHandle: usize, // TODO
/// Returns an array of handles that support a specified protocol.
locateHandle: extern fn (LocateSearchType, ?*align(8) const Guid, ?*const c_void, *usize, [*]Handle) usize,
locateDevicePath: usize, // TODO
installConfigurationTable: usize, // TODO
@ -80,7 +90,8 @@ pub const BootServices = extern struct {
/// Terminates all boot services.
exitBootServices: extern fn (Handle, usize) usize,
getNextMonotonicCount: usize, // TODO
/// Returns a monotonically increasing count for the platform.
getNextMonotonicCount: extern fn (*u64) usize,
/// Induces a fine-grained stall.
stall: extern fn (usize) usize,
@ -100,7 +111,8 @@ pub const BootServices = extern struct {
/// Retrieves the list of agents that currently have a protocol interface opened.
openProtocolInformation: extern fn (Handle, *align(8) const Guid, *[*]ProtocolInformationEntry, *usize) usize,
protocolsPerHandle: usize, // TODO
/// Retrieves the list of protocol interface GUIDs that are installed on a handle in a buffer allocated from pool.
protocolsPerHandle: extern fn (Handle, *[*]*align(8) const Guid, *usize) usize,
/// Returns an array of handles that support the requested protocol in a buffer allocated from pool.
locateHandleBuffer: extern fn (LocateSearchType, ?*align(8) const Guid, ?*const c_void, *usize, *[*]Handle) usize,
@ -110,9 +122,16 @@ pub const BootServices = extern struct {
installMultipleProtocolInterfaces: usize, // TODO
uninstallMultipleProtocolInterfaces: usize, // TODO
calculateCrc32: usize, // TODO
copyMem: usize, // TODO
setMem: usize, // TODO
/// Computes and returns a 32-bit CRC for a data buffer.
calculateCrc32: extern fn ([*]const u8, usize, *u32) usize,
/// Copies the contents of one buffer to another buffer
copyMem: extern fn ([*]u8, [*]const u8, usize) void,
/// Fills a buffer with a specified value
setMem: extern fn ([*]u8, usize, u8) void,
createEventEx: usize, // TODO
pub const signature: u64 = 0x56524553544f4f42;
@ -187,13 +206,13 @@ pub const LocateSearchType = extern enum(u32) {
};
pub const OpenProtocolAttributes = packed struct {
by_handle_protocol: bool,
get_protocol: bool,
test_protocol: bool,
by_child_controller: bool,
by_driver: bool,
exclusive: bool,
_pad: u26,
by_handle_protocol: bool = false,
get_protocol: bool = false,
test_protocol: bool = false,
by_child_controller: bool = false,
by_driver: bool = false,
exclusive: bool = false,
_pad: u26 = undefined,
};
pub const ProtocolInformationEntry = extern struct {
@ -202,3 +221,9 @@ pub const ProtocolInformationEntry = extern struct {
attributes: OpenProtocolAttributes,
open_count: u32,
};
pub const AllocateType = extern enum(u32) {
AllocateAnyPages,
AllocateMaxAddress,
AllocateAddress,
};

View File

@ -28,7 +28,7 @@ pub const RuntimeServices = extern struct {
getVariable: extern fn ([*:0]const u16, *align(8) const Guid, ?*u32, *usize, ?*c_void) usize,
/// Enumerates the current variable names.
getNextVariableName: extern fn (*usize, [*]u16, *align(8) Guid) usize,
getNextVariableName: extern fn (*usize, [*:0]u16, *align(8) Guid) usize,
/// Sets the value of a variable.
setVariable: extern fn ([*:0]const u16, *align(8) const Guid, u32, usize, *c_void) usize,