1 files changed, 7 insertions, 3 deletions

diff --git a/rsnix/src/ps2.rs b/rsnix/src/ps2.rs
index 4747813..35848b6 100644
--- a/rsnix/src/ps2.rs
+++ b/rsnix/src/ps2.rs
@@ -263,8 +263,12 @@ pub fn try_poll_key() -> Option<KeyEvent> {
 
 /// Process a single scancode byte. Returns Some(KeyEvent) when a visible
 /// event happens; returns None for modifier changes, releases, and prefixes.
+fn kbd() -> &'static mut KbdState {
+    unsafe { &mut *core::ptr::addr_of_mut!(KBD) }
+}
+
 fn process_byte(byte: u8) -> Option<KeyEvent> {
-    let state = unsafe { &mut KBD };
+    let state = kbd();
 
     if byte == 0xE0 {
         state.got_e0 = true;
@@ -368,7 +372,7 @@ fn process_e0(byte: u8) -> Option<KeyEvent> {
 }
 
 fn update_modifiers(scancode: u8, pressed: bool, e0: bool) {
-    let state = unsafe { &mut KBD };
+    let state = kbd();
     match (scancode, e0) {
         (0x2A, false) => set_mod(state, MOD_LSHIFT, pressed),
         (0x36, false) => set_mod(state, MOD_RSHIFT, pressed),
@@ -393,6 +397,6 @@ fn set_mod(state: &mut KbdState, bit: u8, pressed: bool) {
 
 /// Is either Ctrl key held?
 fn ctrl_held() -> bool {
-    let state = unsafe { &mut KBD };
+    let state = kbd();
     state.modifiers & (MOD_LCTRL | MOD_RCTRL) != 0
 }