From ff7325df14af17377c2bef16ea195b407bcd9a4a Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Thu, 22 May 2025 20:44:07 +0200
Subject: [PATCH] input/ps2d: More helpful panic locations when initializing
 fails

---
 input/ps2d/src/controller.rs | 27 ++++++++++++++++-----------
 input/ps2d/src/state.rs      |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/input/ps2d/src/controller.rs b/input/ps2d/src/controller.rs
index f1560faaef..3a8c597b7f 100644
--- a/input/ps2d/src/controller.rs
+++ b/input/ps2d/src/controller.rs
@@ -499,14 +499,16 @@ impl Ps2 {
         Ok(mouse_extra)
     }
 
-    pub fn init(&mut self) -> Result<bool, Error> {
+    pub fn init(&mut self) -> bool {
         // Clear remaining data
         self.flush_read("init start");
 
         {
             // Disable devices
-            self.command(Command::DisableFirst)?;
-            self.command(Command::DisableSecond)?;
+            self.command(Command::DisableFirst)
+                .expect("ps2d: failed to initialize");
+            self.command(Command::DisableSecond)
+                .expect("ps2d: failed to initialize");
 
             // Clear remaining data
             self.flush_read("disable");
@@ -521,7 +523,7 @@ impl Ps2 {
                 | ConfigFlags::FIRST_DISABLED
                 | ConfigFlags::SECOND_DISABLED;
             trace!("ps2d: config set {:?}", config);
-            self.set_config(config)?;
+            self.set_config(config).expect("ps2d: failed to initialize");
 
             // Clear remaining data
             self.flush_read("disable interrupts");
@@ -529,15 +531,16 @@ impl Ps2 {
 
         {
             // Perform the self test
-            self.command(Command::TestController)?;
-            assert_eq!(self.read()?, 0x55);
+            self.command(Command::TestController)
+                .expect("ps2d: failed to initialize");
+            assert_eq!(self.read().expect("ps2d: failed to initialize"), 0x55);
 
             // Clear remaining data
             self.flush_read("test controller");
         }
 
         // Initialize keyboard
-        self.init_keyboard()?;
+        self.init_keyboard().expect("ps2d: failed to initialize");
 
         // Initialize mouse
         let (mouse_found, mouse_extra) = match self.init_mouse() {
@@ -551,7 +554,8 @@ impl Ps2 {
         {
             // Enable keyboard data reporting
             // Use inner function to prevent retries
-            self.keyboard_command_inner(KeyboardCommand::EnableReporting as u8)?;
+            self.keyboard_command_inner(KeyboardCommand::EnableReporting as u8)
+                .expect("ps2d: failed to initialize");
             // Response is ignored since scanning is now on
             //TODO: fix by using interrupts?
         }
@@ -559,7 +563,8 @@ impl Ps2 {
         if mouse_found {
             // Enable mouse data reporting
             // Use inner function to prevent retries
-            self.mouse_command_inner(MouseCommand::EnableReporting as u8)?;
+            self.mouse_command_inner(MouseCommand::EnableReporting as u8)
+                .expect("ps2d: failed to initialize");
             // Response is ignored since scanning is now on
             //TODO: fix by using interrupts?
         }
@@ -577,12 +582,12 @@ impl Ps2 {
                 config.remove(ConfigFlags::SECOND_INTERRUPT);
             }
             trace!("ps2d: config set {:?}", config);
-            self.set_config(config)?;
+            self.set_config(config).expect("ps2d: failed to initialize");
         }
 
         // Clear remaining data
         self.flush_read("init finish");
 
-        Ok(mouse_extra)
+        mouse_extra
     }
 }
diff --git a/input/ps2d/src/state.rs b/input/ps2d/src/state.rs
index b9abe4ed42..6e35b33fe9 100644
--- a/input/ps2d/src/state.rs
+++ b/input/ps2d/src/state.rs
@@ -41,7 +41,7 @@ pub struct Ps2d<F: Fn(u8, bool) -> char> {
 impl<F: Fn(u8, bool) -> char> Ps2d<F> {
     pub fn new(input: ProducerHandle, keymap: F) -> Self {
         let mut ps2 = Ps2::new();
-        let extra_packet = ps2.init().expect("ps2d: failed to initialize");
+        let extra_packet = ps2.init();
 
         // FIXME add an option for orbital to disable this when an app captures the mouse.
         let vmmouse_relative = false;