Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ziglang/zig
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c5ad247f06f0eb8025592a88773e5bf23c450ad8
Choose a base ref
..
head repository: ziglang/zig
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3c4cfa8a045e39d90d7a834d290a7bddf1f8c601
Choose a head ref
2 changes: 1 addition & 1 deletion lib/std/os/uefi.zig
View file
Original file line number Diff line number Diff line change
@@ -248,6 +248,6 @@ test {
_ = protocol;
}

pub fn unexpectedError(err: Status.Error) noreturn {
pub fn unexpectedError(err: Status) noreturn {
std.debug.panic("unexpected error: {any}", .{err});
}
4 changes: 2 additions & 2 deletions lib/std/os/uefi/protocol/absolute_pointer.zig
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ pub const AbsolutePointer = extern struct {
switch (self._reset(self, verify)) {
.success => {},
.device_error => return Error.DeviceError,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -29,7 +29,7 @@ pub const AbsolutePointer = extern struct {
.success => return state,
.not_ready => return Error.NotReady,
.device_error => return Error.DeviceError,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

8 changes: 4 additions & 4 deletions lib/std/os/uefi/protocol/block_io.zig
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ pub const BlockIo = extern struct {
switch (self._reset(self, extended_verification)) {
.success => {},
.device_error => return Error.DeviceError,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -32,7 +32,7 @@ pub const BlockIo = extern struct {
.no_media => Error.NoMedia,
.bad_buffer_size => Error.BadBufferSize,
.invalid_parameter => Error.InvalidParameter,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -46,7 +46,7 @@ pub const BlockIo = extern struct {
.device_error => Error.DeviceError,
.bad_buffer_size => Error.BadBufferSize,
.invalid_parameter => Error.InvalidParameter,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -56,7 +56,7 @@ pub const BlockIo = extern struct {
.success => {},
.device_error => Error.DeviceError,
.no_media => Error.NoMedia,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

2 changes: 1 addition & 1 deletion lib/std/os/uefi/protocol/edid.zig
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ pub const Override = extern struct {
switch (self._get_edid(self, handle, attributes, &size, &ptr)) {
.success => {},
.unsupported => return Error.Unsupported,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}

if (size == 0 or ptr == null)
27 changes: 16 additions & 11 deletions lib/std/os/uefi/protocol/file.zig
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,12 @@ pub const File = extern struct {
return .{ .context = self };
}

pub fn open(self: *const File, file_name: [*:0]const u16, open_mode: u64, attributes: u64) !*File {
pub fn open(
self: *const File,
file_name: [*:0]const u16,
open_mode: u64,
attributes: u64,
) !*File {
var new: *File = undefined;
switch (self._open(self, &new, file_name, open_mode, attributes)) {
.success => return new,
@@ -71,14 +76,14 @@ pub const File = extern struct {
.out_of_resources => return Error.OutOfResources,
.volume_full => return Error.VolumeFull,
.invalid_parameter => return Error.InvalidParameter,
else => |err| return uefi.unexpectedError(err.err()),
else => |err| return uefi.unexpectedError(err),
}
}

pub fn close(self: *File) void {
switch (self._close(self)) {
.success => {},
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -90,7 +95,7 @@ pub const File = extern struct {
switch (self._delete(self)) {
.success => return true,
.warn_delete_failure => return false,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -102,7 +107,7 @@ pub const File = extern struct {
.device_error => return Error.DeviceError,
.volume_corrupted => return Error.VolumeCorrupted,
.buffer_too_small => return Error.BufferTooSmall,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -117,7 +122,7 @@ pub const File = extern struct {
.write_protected => return Error.WriteProtected,
.access_denied => return Error.AccessDenied,
.volume_full => return Error.VolumeFull,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -127,7 +132,7 @@ pub const File = extern struct {
.success => return position,
.unsupported => return Error.Unsupported,
.device_error => return Error.DeviceError,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -145,7 +150,7 @@ pub const File = extern struct {
.success => {},
.unsupported => return Error.Unsupported,
.device_error => return Error.DeviceError,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -174,7 +179,7 @@ pub const File = extern struct {
.device_error => return Error.DeviceError,
.volume_corrupted => return Error.VolumeCorrupted,
.buffer_too_small => return Error.BufferTooSmall,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -193,7 +198,7 @@ pub const File = extern struct {
.access_denied => return Error.AccessDenied,
.volume_full => return Error.VolumeFull,
.bad_buffer_size => return Error.BadBufferSize,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

@@ -205,7 +210,7 @@ pub const File = extern struct {
.write_protected => return Error.WriteProtected,
.access_denied => return Error.AccessDenied,
.volume_full => return Error.VolumeFull,
else => |err| uefi.unexpectedError(err.err()),
else => |err| uefi.unexpectedError(err),
}
}

13 changes: 10 additions & 3 deletions lib/std/os/uefi/protocol/graphics_output.zig
View file
Original file line number Diff line number Diff line change
@@ -3,16 +3,23 @@ const uefi = std.os.uefi;
const Guid = uefi.Guid;
const Status = uefi.Status;
const cc = uefi.cc;
const Error = Status.Error;

pub const GraphicsOutput = extern struct {
_query_mode: *const fn (*const GraphicsOutput, u32, *usize, **Mode.Info) callconv(cc) Status,
_set_mode: *const fn (*const GraphicsOutput, u32) callconv(cc) Status,
_set_mode: *const fn (*GraphicsOutput, u32) callconv(cc) Status,
_blt: *const fn (*const GraphicsOutput, ?[*]BltPixel, BltOperation, usize, usize, usize, usize, usize, usize, usize) callconv(cc) Status,
mode: *Mode,

/// Returns information for an available graphics mode that the graphics device and the set of active video output devices supports.
pub fn queryMode(self: *const GraphicsOutput, mode: u32, size_of_info: *usize, info: **Mode.Info) Status {
return self._query_mode(self, mode, size_of_info, info);
pub fn queryMode(self: *const GraphicsOutput, mode: u32, size_of_info: *usize) !*Mode.Info {
var info: *Mode.Info = undefined;
switch (self._query_mode(self, mode, size_of_info, &info)) {
.success => return info,
.device_error => return Error.DeviceError,
.invalid_parameter => return Error.InvalidParameter,
else => |err| uefi.unexpectedError(err.err()),
}
}

/// Set the video device into the specified mode and clears the visible portions of the output display to black.