From 88fdb303ff7a33d87207bbd61a648c5c1dbe56ad Mon Sep 17 00:00:00 2001 From: Nick Erdmann Date: Tue, 6 Aug 2019 18:06:18 +0200 Subject: [PATCH] std/os/uefi: replace init() with default values --- .../protocols/absolute_pointer_protocol.zig | 17 ++++---------- .../protocols/graphics_output_protocol.zig | 23 +++++-------------- .../protocols/simple_pointer_protocol.zig | 20 ++++------------ .../simple_text_input_ex_protocol.zig | 11 ++------- 4 files changed, 17 insertions(+), 54 deletions(-) diff --git a/std/os/uefi/protocols/absolute_pointer_protocol.zig b/std/os/uefi/protocols/absolute_pointer_protocol.zig index 6621b3128860b92e99bf60dc36beff5e19f7e505..b1fcc4902e0c21fb63b26578d198d35a0e53e3fb 100644 --- a/std/os/uefi/protocols/absolute_pointer_protocol.zig +++ b/std/os/uefi/protocols/absolute_pointer_protocol.zig @@ -43,22 +43,13 @@ pub const AbsolutePointerMode = extern struct { }; pub const AbsolutePointerState = extern struct { - current_x: u64, - current_y: u64, - current_z: u64, + current_x: u64 = undefined, + current_y: u64 = undefined, + current_z: u64 = undefined, active_buttons: packed struct { _pad1: u6, alt_active: bool, touch_active: bool, _pad2: u24, - }, - - pub fn init() AbsolutePointerState { - return AbsolutePointerState{ - .current_x = undefined, - .current_y = undefined, - .current_z = undefined, - .active_buttons = undefined, - }; - } + } = undefined, }; diff --git a/std/os/uefi/protocols/graphics_output_protocol.zig b/std/os/uefi/protocols/graphics_output_protocol.zig index b4ce6a6f563544df65e52ec34f727ddf83503749..4713df0501d16a07fd27a61e59134bd50f376294 100644 --- a/std/os/uefi/protocols/graphics_output_protocol.zig +++ b/std/os/uefi/protocols/graphics_output_protocol.zig @@ -40,23 +40,12 @@ pub const GraphicsOutputProtocolMode = extern struct { }; pub const GraphicsOutputModeInformation = extern struct { - version: u32, - horizontal_resolution: u32, - vertical_resolution: u32, - pixel_format: GraphicsPixelFormat, - pixel_information: PixelBitmask, - pixels_per_scan_line: u32, - - pub fn init() GraphicsOutputModeInformation { - return GraphicsOutputModeInformation{ - .version = undefined, - .horizontal_resolution = undefined, - .vertical_resolution = undefined, - .pixel_format = undefined, - .pixel_information = undefined, - .pixels_per_scan_line = undefined, - }; - } + version: u32 = undefined, + horizontal_resolution: u32 = undefined, + vertical_resolution: u32 = undefined, + pixel_format: GraphicsPixelFormat = undefined, + pixel_information: PixelBitmask = undefined, + pixels_per_scan_line: u32 = undefined, }; pub const GraphicsPixelFormat = extern enum(u32) { diff --git a/std/os/uefi/protocols/simple_pointer_protocol.zig b/std/os/uefi/protocols/simple_pointer_protocol.zig index 8a84bb4ccf65f2c07eb4abc1f0fa7337fa6c77a2..26d11ca7f54d06401e5dbe3a8b056630bac95ad2 100644 --- a/std/os/uefi/protocols/simple_pointer_protocol.zig +++ b/std/os/uefi/protocols/simple_pointer_protocol.zig @@ -36,19 +36,9 @@ pub const SimplePointerMode = struct { }; pub const SimplePointerState = struct { - relative_movement_x: i32, - relative_movement_y: i32, - relative_movement_z: i32, - left_button: bool, - right_button: bool, - - pub fn init() SimplePointerState { - return SimplePointerState{ - .relative_movement_x = undefined, - .relative_movement_y = undefined, - .relative_movement_z = undefined, - .left_button = undefined, - .right_button = undefined, - }; - } + relative_movement_x: i32 = undefined, + relative_movement_y: i32 = undefined, + relative_movement_z: i32 = undefined, + left_button: bool = undefined, + right_button: bool = undefined, }; diff --git a/std/os/uefi/protocols/simple_text_input_ex_protocol.zig b/std/os/uefi/protocols/simple_text_input_ex_protocol.zig index 78d5cf2c8c25fb38e8238eb6e20255a27bdd7aaf..16f676fd2d0f7c2b83b916d26bf4edf4f6715701 100644 --- a/std/os/uefi/protocols/simple_text_input_ex_protocol.zig +++ b/std/os/uefi/protocols/simple_text_input_ex_protocol.zig @@ -42,15 +42,8 @@ pub const SimpleTextInputExProtocol = extern struct { }; pub const KeyData = extern struct { - key: InputKey, - key_state: KeyState, - - pub fn init() KeyData { - return KeyData{ - .key = undefined, - .key_state = undefined, - }; - } + key: InputKey = undefined, + key_state: KeyState = undefined, }; pub const KeyState = extern struct { -- 2.54.0