authorgravatar for n@nirf.deNick Erdmann <n@nirf.de> 2019-09-02 22:31:59+02:00
committergravatar for n@nirf.deNick Erdmann <n@nirf.de> 2019-09-02 22:31:59+02:00
log5e874a89b991fcabe8177c551c220894593c1632
treeaea91d811b3ea187b3d4774afcb99e8a5f7c36b6
parent8db41b7adbd0d1112a914d05ed94e9b55cfaf2db
signaturelock-open Commit is signed but in an unrecognized format.

std/os/uefi: fix ordering of packed bit fields

3 files changed, 20 insertions(+), 25 deletions(-)

std/os/uefi/protocols/absolute_pointer_protocol.zig+4-6
...@@ -35,10 +35,9 @@ pub const AbsolutePointerMode = extern struct {...@@ -35,10 +35,9 @@ pub const AbsolutePointerMode = extern struct {
35 absolute_max_y: u64,35 absolute_max_y: u64,
36 absolute_max_z: u64,36 absolute_max_z: u64,
37 attributes: packed struct {37 attributes: packed struct {
38 _pad1: u6,
39 supports_pressure_as_z: bool,
40 supports_alt_active: bool,38 supports_alt_active: bool,
41 _pad2: u24,39 supports_pressure_as_z: bool,
40 _pad1: u30,
42 },41 },
43};42};
4443
...@@ -47,9 +46,8 @@ pub const AbsolutePointerState = extern struct {...@@ -47,9 +46,8 @@ pub const AbsolutePointerState = extern struct {
47 current_y: u64 = undefined,46 current_y: u64 = undefined,
48 current_z: u64 = undefined,47 current_z: u64 = undefined,
49 active_buttons: packed struct {48 active_buttons: packed struct {
50 _pad1: u6,
51 alt_active: bool,
52 touch_active: bool,49 touch_active: bool,
53 _pad2: u24,50 alt_active: bool,
51 _pad1: u30,
54 } = undefined,52 } = undefined,
55};53};
std/os/uefi/protocols/edid_override_protocol.zig+2-3
...@@ -22,8 +22,7 @@ pub const EdidOverrideProtocol = extern struct {...@@ -22,8 +22,7 @@ pub const EdidOverrideProtocol = extern struct {
22};22};
2323
24pub const EdidOverrideProtocolAttributes = packed struct {24pub const EdidOverrideProtocolAttributes = packed struct {
25 _pad1: u6,
26 enable_hot_plug: bool,
27 dont_override: bool,25 dont_override: bool,
28 _pad2: u24,26 enable_hot_plug: bool,
27 _pad1: u30,
29};28};
std/os/uefi/protocols/simple_text_input_ex_protocol.zig+14-16
...@@ -48,28 +48,26 @@ pub const KeyData = extern struct {...@@ -48,28 +48,26 @@ pub const KeyData = extern struct {
4848
49pub const KeyState = extern struct {49pub const KeyState = extern struct {
50 key_shift_state: packed struct {50 key_shift_state: packed struct {
51 left_logo_pressed: bool,
52 right_logo_pressed: bool,
53 left_alt_pressed: bool,
54 right_alt_pressed: bool,
55 left_control_pressed: bool,
56 right_control_pressed: bool,
57 left_shift_pressed: bool,
58 right_shift_pressed: bool,51 right_shift_pressed: bool,
59 _pad1: u6,52 left_shift_pressed: bool,
60 sys_req_pressed: bool,53 right_control_pressed: bool,
54 left_control_pressed: bool,
55 right_alt_pressed: bool,
56 left_alt_pressed: bool,
57 right_logo_pressed: bool,
58 left_logo_pressed: bool,
61 menu_key_pressed: bool,59 menu_key_pressed: bool,
62 _pad2: u15,60 sys_req_pressed: bool,
61 _pad1: u21,
63 shift_state_valid: bool,62 shift_state_valid: bool,
64 },63 },
65 key_toggle_state: packed struct {64 key_toggle_state: packed struct {
66 toggle_state_valid: bool,
67 _pad1: u2,
68 key_state_exposed: bool,
69 caps_lock_active: bool,
70 _pad2: u1,
71 num_lock_active: bool,
72 scroll_lock_active: bool,65 scroll_lock_active: bool,
66 num_lock_active: bool,
67 caps_lock_active: bool,
68 _pad1: u3,
69 key_state_exposed: bool,
70 toggle_state_valid: bool,
73 },71 },
74};72};
7573