Fix windows driver

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

framework_lib/src/ccgx/device.rs

@@ -232,7 +232,8 @@ impl PdController {
     pub fn get_silicon_id(&self) -> EcResult<u16> {
         let data = self.ccgx_read(ControlRegisters::SiliconId, 2)?;
         assert!(data.len() >= 2);
-        debug_assert_eq!(data.len(), 2);
+        // TODO: The Windows driver seems to return 20 more bytes than expected
+        //debug_assert_eq!(data.len(), 2);
         Ok(u16::from_le_bytes([data[0], data[1]]))
     }
 

framework_lib/src/chromium_ec/command.rs

@@ -136,9 +136,10 @@ pub trait EcRequestRaw<R> {
         Self: Sized,
     {
         let response = self.send_command_vec_extra(ec, extra_data)?;
-        if response.len() != std::mem::size_of::<R>() {
+        // TODO: The Windows driver seems to return 20 more bytes than expected
+        if response.len() < std::mem::size_of::<R>() {
             return Err(EcError::DeviceError(format!(
-                "Returned data is not the expected ({}) size: {}",
+                "Returned data size ({}) is less than expected ({})",
                 response.len(),
                 std::mem::size_of::<R>()
             )));

framework_lib/src/chromium_ec/windows.rs

@@ -112,7 +112,10 @@ pub fn send_command(command: u16, command_version: u8, data: &[u8]) -> EcResult<
         Some(status) => return Err(EcError::Response(status)),
     }
 
-    let out_buffer = &cmd.buffer[..(returned as usize)];
+    // TODO: Figure out why that's sometimes bigger
+    let end = std::cmp::min(returned, 256);
+
+    let out_buffer = &cmd.buffer[..(end as usize)];
     Ok(out_buffer.to_vec())
 }