Merge pull request #17 from FrameworkComputer/cmd-version

chromium_ec: Add function to check command version support

framework_lib/src/chromium_ec/command.rs

@@ -19,6 +19,7 @@ pub enum EcCommands {
     GetBuildInfo = 0x04,
     /// Command to read data from EC memory map
     ReadMemMap = 0x07,
+    GetCmdVersions = 0x08,
     PwmGetKeyboardBacklight = 0x0022,
     PwmSetKeyboardBacklight = 0x0023,
     I2cPassthrough = 0x9e,

framework_lib/src/chromium_ec/commands.rs

@@ -22,6 +22,42 @@ impl EcRequest<EcResponseGetVersion> for EcRequestGetVersion {
     }
 }
 
+#[repr(C, packed)]
+pub struct EcRequestGetCmdVersionsV0 {
+    pub cmd: u8,
+}
+#[repr(C, packed)]
+#[derive(Debug, Clone, Copy)]
+pub struct EcResponseGetCmdVersionsV0 {
+    pub version_mask: u32,
+}
+impl EcRequest<EcResponseGetCmdVersionsV0> for EcRequestGetCmdVersionsV0 {
+    fn command_id() -> EcCommands {
+        EcCommands::GetCmdVersions
+    }
+    fn command_version() -> u8 {
+        0
+    }
+}
+
+#[repr(C, packed)]
+pub struct EcRequestGetCmdVersionsV1 {
+    pub cmd: u32,
+}
+#[repr(C, packed)]
+#[derive(Debug, Clone, Copy)]
+pub struct EcResponseGetCmdVersionsV1 {
+    pub version_mask: u32,
+}
+impl EcRequest<EcResponseGetCmdVersionsV1> for EcRequestGetCmdVersionsV1 {
+    fn command_id() -> EcCommands {
+        EcCommands::GetCmdVersions
+    }
+    fn command_version() -> u8 {
+        1
+    }
+}
+
 #[repr(C, packed)]
 pub struct EcRequestPwmSetKeyboardBacklight {
     pub percent: u8,

framework_lib/src/chromium_ec/mod.rs

@@ -181,6 +181,18 @@ impl CrosEc {
         }
     }
 
+    pub fn cmd_version_supported(&self, cmd: u16, version: u8) -> EcResult<bool> {
+        let res = EcRequestGetCmdVersionsV1 { cmd: cmd.into() }.send_command(self);
+        let mask = if let Ok(res) = res {
+            res.version_mask
+        } else {
+            let res = EcRequestGetCmdVersionsV0 { cmd: cmd as u8 }.send_command(self)?;
+            res.version_mask
+        };
+
+        Ok(mask & (1 << version) > 0)
+    }
+
     pub fn dump_mem_region(&self) -> Option<Vec<u8>> {
         // Crashes on Linux cros_ec driver if we read the last byte
         self.read_memory(0x00, EC_MEMMAP_SIZE - 1)