authorgravatar for n@nirf.deNick Erdmann <n@nirf.de> 2020-03-12 22:21:01+01:00
committergravatar for n@nirf.deNick Erdmann <n@nirf.de> 2020-03-12 23:23:21+01:00
logf44530302ecef3263cf39eff829d7c3e53e9f95d
treebab1744c300825531483ba700c98113ba3e1a757
parent92beb13914a680f4b41fe459ab095684076daa07

std/os/uefi: file protocol improvements

2 files changed, 13 insertions(+), 10 deletions(-)

lib/std/os/uefi/protocols/file_protocol.zig+12-9
...@@ -5,16 +5,16 @@ const Status = uefi.Status;...@@ -5,16 +5,16 @@ const Status = uefi.Status;
55
6pub const FileProtocol = extern struct {6pub const FileProtocol = extern struct {
7 revision: u64,7 revision: u64,
8 _open: extern fn (*const FileProtocol, **const FileProtocol, *u16, u64, u64) Status,8 _open: extern fn (*const FileProtocol, **const FileProtocol, [*:0]const u16, u64, u64) Status,
9 _close: extern fn (*const FileProtocol) Status,9 _close: extern fn (*const FileProtocol) Status,
10 _delete: extern fn (*const FileProtocol) Status,10 _delete: extern fn (*const FileProtocol) Status,
11 _read: extern fn (*const FileProtocol, *usize, *c_void) Status,11 _read: extern fn (*const FileProtocol, *usize, [*]u8) Status,
12 _write: extern fn (*const FileProtocol, *usize, *c_void) Status,12 _write: extern fn (*const FileProtocol, *usize, [*]const u8) Status,
13 _get_info: extern fn (*const FileProtocol, *Guid, *usize, *c_void) Status,13 _get_info: extern fn (*const FileProtocol, *Guid, *usize, *c_void) Status,
14 _set_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,15 _flush: extern fn (*const FileProtocol) Status,
1616
17 pub fn open(self: *const FileProtocol, new_handle: **const FileProtocol, file_name: *u16, open_mode: u64, attributes: u64) Status {17 pub fn open(self: *const FileProtocol, new_handle: **const FileProtocol, file_name: [*:0]const u16, open_mode: u64, attributes: u64) Status {
18 return self._open(self, new_handle, file_name, open_mode, attributes);18 return self._open(self, new_handle, file_name, open_mode, attributes);
19 }19 }
2020
...@@ -26,11 +26,11 @@ pub const FileProtocol = extern struct {...@@ -26,11 +26,11 @@ pub const FileProtocol = extern struct {
26 return self._delete(self);26 return self._delete(self);
27 }27 }
2828
29 pub fn read(self: *const FileProtocol, buffer_size: *usize, buffer: *c_void) Status {29 pub fn read(self: *const FileProtocol, buffer_size: *usize, buffer: [*]u8) Status {
30 return self._read(self, buffer_size, buffer);30 return self._read(self, buffer_size, buffer);
31 }31 }
3232
33 pub fn write(self: *const FileProtocol, buffer_size: *usize, buffer: *c_void) Status {33 pub fn write(self: *const FileProtocol, buffer_size: *usize, buffer: [*]const u8) Status {
34 return self._write(self, buffer_size, buffer);34 return self._write(self, buffer_size, buffer);
35 }35 }
3636
...@@ -38,7 +38,7 @@ pub const FileProtocol = extern struct {...@@ -38,7 +38,7 @@ pub const FileProtocol = extern struct {
38 return self._get_info(self, information_type, buffer_size, buffer);38 return self._get_info(self, information_type, buffer_size, buffer);
39 }39 }
4040
41 pub fn set_info(self: *const FileProtocol, information_type: *Guid, buffer_size: usize, buffer: *c_void) Status {41 pub fn set_info(self: *const FileProtocol, information_type: *Guid, buffer_size: usize, buffer: *const c_void) Status {
42 return self._set_info(self, information_type, buffer_size, buffer);42 return self._set_info(self, information_type, buffer_size, buffer);
43 }43 }
4444
...@@ -76,7 +76,10 @@ pub const FileInfo = extern struct {...@@ -76,7 +76,10 @@ pub const FileInfo = extern struct {
76 last_access_time: Time,76 last_access_time: Time,
77 modification_time: Time,77 modification_time: Time,
78 attribute: u64,78 attribute: u64,
79 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 }
8083
81 pub const efi_file_read_only: u64 = 0x0000000000000001;84 pub const efi_file_read_only: u64 = 0x0000000000000001;
82 pub const efi_file_hidden: u64 = 0x0000000000000002;85 pub const efi_file_hidden: u64 = 0x0000000000000002;
lib/std/os/uefi/protocols/simple_file_system_protocol.zig+1-1
...@@ -3,7 +3,7 @@ const Guid = uefi.Guid;...@@ -3,7 +3,7 @@ const Guid = uefi.Guid;
3const FileProtocol = uefi.protocols.FileProtocol;3const FileProtocol = uefi.protocols.FileProtocol;
4const Status = uefi.Status;4const Status = uefi.Status;
55
6const SimpleFileSystemProtocol = extern struct {6pub const SimpleFileSystemProtocol = extern struct {
7 revision: u64,7 revision: u64,
8 _open_volume: extern fn (*const SimpleFileSystemProtocol, **const FileProtocol) Status,8 _open_volume: extern fn (*const SimpleFileSystemProtocol, **const FileProtocol) Status,
99