From a3b2de1d1ec3a5ad78fed46e69f251e6ee19be50 Mon Sep 17 00:00:00 2001 From: Heppoko Date: Mon, 13 Apr 2020 05:45:11 +0900 Subject: [PATCH] fix file protocol structure definitions (#5015) --- lib/std/os/uefi/protocols/file_protocol.zig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/std/os/uefi/protocols/file_protocol.zig b/lib/std/os/uefi/protocols/file_protocol.zig index fb5810d4f..4331d9a38 100644 --- a/lib/std/os/uefi/protocols/file_protocol.zig +++ b/lib/std/os/uefi/protocols/file_protocol.zig @@ -10,8 +10,10 @@ pub const FileProtocol = extern struct { _delete: extern fn (*const FileProtocol) Status, _read: extern fn (*const FileProtocol, *usize, [*]u8) Status, _write: extern fn (*const FileProtocol, *usize, [*]const u8) Status, - _get_info: extern fn (*const FileProtocol, *Guid, *usize, *c_void) Status, - _set_info: extern fn (*const FileProtocol, *Guid, usize, *const c_void) Status, + _get_position: extern fn (*const FileProtocol, *u64) Status, + _set_position: extern fn (*const FileProtocol, *const u64) Status, + _get_info: extern fn (*const FileProtocol, *align(8) const Guid, *const usize, [*]u8) Status, + _set_info: extern fn (*const FileProtocol, *align(8) const Guid, usize, [*]const u8) Status, _flush: extern fn (*const FileProtocol) Status, pub fn open(self: *const FileProtocol, new_handle: **const FileProtocol, file_name: [*:0]const u16, open_mode: u64, attributes: u64) Status { @@ -34,11 +36,11 @@ pub const FileProtocol = extern struct { return self._write(self, buffer_size, buffer); } - pub fn get_info(self: *const FileProtocol, information_type: *Guid, buffer_size: *usize, buffer: *c_void) Status { + pub fn get_info(self: *const FileProtocol, information_type: *align(8) Guid, buffer_size: *usize, buffer: [*]u8) Status { return self._get_info(self, information_type, buffer_size, buffer); } - pub fn set_info(self: *const FileProtocol, information_type: *Guid, buffer_size: usize, buffer: *const c_void) Status { + pub fn set_info(self: *const FileProtocol, information_type: *align(8) Guid, buffer_size: usize, buffer: [*]const u8) Status { return self._set_info(self, information_type, buffer_size, buffer); }