| author |  Nick Erdmann <n@nirf.de> 2019-08-09 23:12:59+02:00 |
| committer | Nick Erdmann <n@nirf.de> 2019-08-10 19:14:31+02:00 |
| log | 9445b3f057bdeb57cdb02c86b94145ae9a345531 |
| tree | c81d9719a276ac2b28e831bc6f8c48bcc457a59f |
| parent | 88fdb303ff7a33d87207bbd61a648c5c1dbe56ad |
| signature |  Commit is signed but in an unrecognized format. |
std/os/uefi: change type of Handle from @OpaqueType to *@OpaqueType
5 files changed, 9 insertions(+), 9 deletions(-)
std- os
- uefi.zig
- uefi
- protocols
- special
std/os/uefi.zig+2-2
| ... | ... | @@ -5,7 +5,7 @@ pub const tables = @import("uefi/tables.zig"); |
| 5 | 5 | const builtin = @import("builtin"); |
| 6 | 6 | pub const is_the_target = builtin.os == .uefi; |
| 7 | 7 | |
| 8 | pub var handle: *Handle = undefined; | |
| 8 | pub var handle: Handle = undefined; | |
| 9 | 9 | pub var system_table: *tables.SystemTable = undefined; |
| 10 | 10 | |
| 11 | 11 | pub const Event = @OpaqueType(); |
| ... | ... | @@ -18,7 +18,7 @@ pub const Guid = extern struct { |
| 18 | 18 | clock_seq_low: u8, |
| 19 | 19 | node: [6]u8, |
| 20 | 20 | }; |
| 21 | pub const Handle = @OpaqueType(); | |
| 21 | pub const Handle = *@OpaqueType(); | |
| 22 | 22 | pub const Time = extern struct { |
| 23 | 23 | year: u16, |
| 24 | 24 | month: u8, |
std/os/uefi/protocols/edid_override_protocol.zig+2-2
| ... | ... | @@ -4,10 +4,10 @@ const Handle = uefi.Handle; |
| 4 | 4 | |
| 5 | 5 | /// UEFI Specification, Version 2.8, 12.9 |
| 6 | 6 | pub const EdidOverrideProtocol = extern struct { |
| 7 | _get_edid: extern fn (*const EdidOverrideProtocol, *const Handle, *u32, *usize, *?[*]u8) usize, | |
| 7 | _get_edid: extern fn (*const EdidOverrideProtocol, Handle, *u32, *usize, *?[*]u8) usize, | |
| 8 | 8 | |
| 9 | 9 | /// attributes must be align(4) |
| 10 | pub fn getEdid(self: *const EdidOverrideProtocol, handle: *const Handle, attributes: *EdidOverrideProtocolAttributes, edid_size: *usize, edid: *?[*]u8) usize { | |
| 10 | pub fn getEdid(self: *const EdidOverrideProtocol, handle: Handle, attributes: *EdidOverrideProtocolAttributes, edid_size: *usize, edid: *?[*]u8) usize { | |
| 11 | 11 | return self._get_edid(self, handle, attributes, edid_size, edid); |
| 12 | 12 | } |
| 13 | 13 |
std/os/uefi/tables/boot_services.zig+1-1
| ... | ... | @@ -39,7 +39,7 @@ pub const BootServices = extern struct { |
| 39 | 39 | installConfigurationTable: usize, // TODO |
| 40 | 40 | imageLoad: usize, // TODO |
| 41 | 41 | imageStart: usize, // TODO |
| 42 | exit: extern fn (*const Handle, usize, usize, ?*const c_void) usize, | |
| 42 | exit: extern fn (Handle, usize, usize, ?*const c_void) usize, | |
| 43 | 43 | imageUnload: usize, // TODO |
| 44 | 44 | exitBootServices: usize, // TODO |
| 45 | 45 | getNextMonotonicCount: usize, // TODO |
std/os/uefi/tables/system_table.zig+3-3
| ... | ... | @@ -19,11 +19,11 @@ pub const SystemTable = extern struct { |
| 19 | 19 | hdr: TableHeader, |
| 20 | 20 | firmware_vendor: *u16, |
| 21 | 21 | firmware_revision: u32, |
| 22 | console_in_handle: ?*Handle, | |
| 22 | console_in_handle: ?Handle, | |
| 23 | 23 | con_in: ?*SimpleTextInputExProtocol, |
| 24 | console_out_handle: ?*Handle, | |
| 24 | console_out_handle: ?Handle, | |
| 25 | 25 | con_out: ?*SimpleTextOutputProtocol, |
| 26 | standard_error_handle: ?*Handle, | |
| 26 | standard_error_handle: ?Handle, | |
| 27 | 27 | std_err: ?*SimpleTextOutputProtocol, |
| 28 | 28 | runtime_services: *RuntimeServices, |
| 29 | 29 | boot_services: ?*BootServices, |
std/special/start.zig+1-1
| ... | ... | @@ -31,7 +31,7 @@ extern fn wasm_freestanding_start() void { |
| 31 | 31 | _ = callMain(); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | extern fn EfiMain(handle: *uefi.Handle, system_table: *uefi.tables.SystemTable) usize { | |
| 34 | extern fn EfiMain(handle: uefi.Handle, system_table: *uefi.tables.SystemTable) usize { | |
| 35 | 35 | const bad_efi_main_ret = "expected return type of main to be 'void', 'noreturn', or 'usize'"; |
| 36 | 36 | uefi.handle = handle; |
| 37 | 37 | uefi.system_table = system_table; |