Merge pull request #101 from FrameworkComputer/inputmodule-mode

Author: JohnAZoidberg

framework_lib/src/chromium_ec/commands.rs

@@ -181,8 +181,18 @@ impl EcRequest<EcResponsePrivacySwitches> for EcRequestPrivacySwitches {
     }
 }
 
+#[repr(u8)]
+pub enum DeckStateMode {
+    ReadOnly = 0x00,
+    Required = 0x01,
+    ForceOn = 0x02,
+    ForceOff = 0x04,
+}
+
 #[repr(C, packed)]
-pub struct EcRequestDeckState {}
+pub struct EcRequestDeckState {
+    pub mode: DeckStateMode,
+}
 
 #[repr(C, packed)]
 pub struct EcResponseDeckState {

framework_lib/src/chromium_ec/mod.rs

@@ -247,7 +247,16 @@ impl CrosEc {
     }
 
     pub fn get_input_deck_status(&self) -> EcResult<InputDeckStatus> {
-        let status = EcRequestDeckState {}.send_command(self)?;
+        let status = EcRequestDeckState {
+            mode: DeckStateMode::ReadOnly,
+        }
+        .send_command(self)?;
+
+        Ok(InputDeckStatus::from(status))
+    }
+
+    pub fn set_input_deck_mode(&self, mode: DeckStateMode) -> EcResult<InputDeckStatus> {
+        let status = EcRequestDeckState { mode }.send_command(self)?;
 
         Ok(InputDeckStatus::from(status))
     }

framework_lib/src/commandline/clap_std.rs

@@ -4,7 +4,7 @@
 use clap::Parser;
 
 use crate::chromium_ec::CrosEcDriverType;
-use crate::commandline::{Cli, ConsoleArg};
+use crate::commandline::{Cli, ConsoleArg, InputDeckModeArg};
 
 /// Swiss army knife for Framework laptops
 #[derive(Parser)]
@@ -85,6 +85,10 @@ struct ClapCli {
     #[arg(long)]
     inputmodules: bool,
 
+    /// Show status of the input modules (Framework 16 only)
+    #[arg(long)]
+    input_deck_mode: Option<InputDeckModeArg>,
+
     /// Set keyboard backlight percentage or get, if no value provided
     #[arg(long)]
     kblight: Option<Option<u8>>,
@@ -137,6 +141,7 @@ pub fn parse(args: &[String]) -> Cli {
             .map(|x| x.into_os_string().into_string().unwrap()),
         intrusion: args.intrusion,
         inputmodules: args.inputmodules,
+        input_deck_mode: args.input_deck_mode,
         kblight: args.kblight,
         console: args.console,
         driver: args.driver,

framework_lib/src/commandline/mod.rs

@@ -28,6 +28,7 @@ use crate::ccgx::device::{PdController, PdPort};
 use crate::ccgx::hid::{check_ccg_fw_version, find_devices, DP_CARD_PID, HDMI_CARD_PID};
 use crate::ccgx::{self, SiliconId::*};
 use crate::chromium_ec;
+use crate::chromium_ec::commands::DeckStateMode;
 use crate::chromium_ec::print_err;
 #[cfg(feature = "linux")]
 use crate::csme;
@@ -55,6 +56,23 @@ pub enum ConsoleArg {
     Follow,
 }
 
+#[cfg_attr(not(feature = "uefi"), derive(clap::ValueEnum))]
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum InputDeckModeArg {
+    Auto,
+    Off,
+    On,
+}
+impl From<InputDeckModeArg> for DeckStateMode {
+    fn from(w: InputDeckModeArg) -> DeckStateMode {
+        match w {
+            InputDeckModeArg::Auto => DeckStateMode::Required,
+            InputDeckModeArg::Off => DeckStateMode::ForceOff,
+            InputDeckModeArg::On => DeckStateMode::ForceOn,
+        }
+    }
+}
+
 /// Shadows `clap_std::ClapCli` with extras for UEFI
 ///
 /// The UEFI commandline currently doesn't use clap, so we need to shadow the struct.
@@ -81,6 +99,7 @@ pub struct Cli {
     pub test: bool,
     pub intrusion: bool,
     pub inputmodules: bool,
+    pub input_deck_mode: Option<InputDeckModeArg>,
     pub kblight: Option<Option<u8>>,
     pub console: Option<ConsoleArg>,
     pub help: bool,
@@ -410,6 +429,9 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
         } else {
             println!("  Unable to tell");
         }
+    } else if let Some(mode) = &args.input_deck_mode {
+        println!("Set mode to: {:?}", mode);
+        ec.set_input_deck_mode((*mode).into()).unwrap();
     } else if let Some(Some(kblight)) = args.kblight {
         assert!(kblight <= 100);
         ec.set_keyboard_backlight(kblight);

framework_lib/src/commandline/uefi.rs

@@ -12,7 +12,7 @@ use uefi::Identify;
 use crate::chromium_ec::CrosEcDriverType;
 use crate::commandline::Cli;
 
-use super::ConsoleArg;
+use super::{ConsoleArg, InputDeckModeArg};
 
 /// Get commandline arguments from UEFI environment
 pub fn get_args(boot_services: &BootServices) -> Vec<String> {
@@ -72,6 +72,7 @@ pub fn parse(args: &[String]) -> Cli {
         ho2_capsule: None,
         intrusion: false,
         inputmodules: false,
+        input_deck_mode: None,
         kblight: None,
         console: None,
         // This is the only driver that works on UEFI
@@ -130,6 +131,27 @@ pub fn parse(args: &[String]) -> Cli {
         } else if arg == "--inputmodules" {
             cli.inputmodules = true;
             found_an_option = true;
+        } else if arg == "--input-deck-mode" {
+            cli.input_deck_mode = if args.len() > i + 1 {
+                let input_deck_mode = &args[i + 1];
+                if input_deck_mode == "auto" {
+                    Some(InputDeckModeArg::Auto)
+                } else if input_deck_mode == "off" {
+                    Some(InputDeckModeArg::Off)
+                } else if input_deck_mode == "on" {
+                    Some(InputDeckModeArg::On)
+                } else {
+                    println!("Invalid value for --input-deck-mode: {}", input_deck_mode);
+                    None
+                }
+            } else {
+                println!(
+                    "Need to provide a value for --input-deck-mode. Either `auto`, `off`, or `on`"
+                );
+                None
+            };
+            found_an_option = true;
+        } else if arg == "-t" || arg == "--test" {
         } else if arg == "--kblight" {
             cli.kblight = if args.len() > i + 1 {
                 if let Ok(percent) = args[i + 1].parse::<u8>() {