type-c-service: Pull in latest embedded-usb-pd (#458)

Author: RobertZ2011

Cargo.lock

@@ -219,7 +219,7 @@ pub enum Response<'a> {
     /// Controller response
     Controller(InternalResponse<'a>),
     /// UCSI response passthrough
-    Lpm(lpm::Response),
+    Ucsi(ucsi::Response),
     /// Port response
     Port(PortResponse),
 }
@@ -585,7 +585,7 @@ impl ContextToken {
         &self,
         port_id: GlobalPortId,
         command: lpm::CommandData,
-    ) -> Result<lpm::ResponseData, PdError> {
+    ) -> Result<ucsi::Response, PdError> {
         let node = self.find_node_by_port(port_id).await?;
 
         match node
@@ -597,7 +597,7 @@ impl ContextToken {
             }))
             .await
         {
-            Response::Lpm(response) => response,
+            Response::Ucsi(response) => Ok(response),
             r => {
                 error!("Invalid response: expected LPM, got {:?}", r);
                 Err(PdError::InvalidResponse)
@@ -610,7 +610,7 @@ impl ContextToken {
         &self,
         port_id: GlobalPortId,
         command: lpm::CommandData,
-    ) -> Result<lpm::ResponseData, PdError> {
+    ) -> Result<ucsi::Response, PdError> {
         match with_timeout(
             DEFAULT_TIMEOUT,
             self.send_port_command_ucsi_no_timeout(port_id, command),
@@ -627,7 +627,7 @@ impl ContextToken {
         &self,
         port_id: GlobalPortId,
         reset_type: lpm::ResetType,
-    ) -> Result<lpm::ResponseData, PdError> {
+    ) -> Result<ucsi::Response, PdError> {
         self.send_port_command_ucsi(port_id, lpm::CommandData::ConnectorReset(reset_type))
             .await
     }

embedded-service/src/type_c/controller.rs

@@ -15,6 +15,7 @@ const POWER0: power::policy::DeviceId = power::policy::DeviceId(0);
 
 mod test_controller {
     use embedded_services::type_c::controller::{ControllerStatus, PortStatus};
+    use embedded_usb_pd::ucsi;
 
     use super::*;
 
@@ -68,11 +69,14 @@ mod test_controller {
             }
         }
 
-        async fn process_ucsi_command(&self, command: lpm::Command) -> Result<lpm::ResponseData, Error> {
+        async fn process_ucsi_command(&self, command: lpm::Command) -> ucsi::Response {
             match command.operation {
                 lpm::CommandData::ConnectorReset(reset_type) => {
                     info!("Reset ({:#?}) for port {:#?}", reset_type, command.port);
-                    Ok(lpm::ResponseData::Complete)
+                    ucsi::Response {
+                        cci: ucsi::cci::Cci::new_cmd_complete(),
+                        data: None,
+                    }
                 }
             }
         }
@@ -100,7 +104,7 @@ mod test_controller {
                     controller::Response::Controller(self.process_controller_command(command).await)
                 }
                 controller::Command::Lpm(command) => {
-                    controller::Response::Lpm(self.process_ucsi_command(command).await)
+                    controller::Response::Ucsi(self.process_ucsi_command(command).await)
                 }
                 controller::Command::Port(command) => {
                     controller::Response::Port(self.process_port_command(command).await)

examples/std/src/bin/type_c/basic.rs

@@ -4,7 +4,7 @@ use embassy_time::{Duration, Timer};
 use embedded_services::debug;
 use embedded_services::type_c::controller::{InternalResponseData, Response};
 use embedded_usb_pd::constants::{T_SRC_TRANS_REQ_EPR_MS, T_SRC_TRANS_REQ_SPR_MS};
-use embedded_usb_pd::ucsi::lpm;
+use embedded_usb_pd::ucsi;
 
 use super::*;
 
@@ -278,7 +278,10 @@ impl<'a, const N: usize, C: Controller, BACK: Backing<'a>, V: FwOfferValidator>
             controller::Command::Controller(command) => {
                 self.process_controller_command(controller, state, command).await
             }
-            controller::Command::Lpm(_) => controller::Response::Lpm(lpm::Response::Err(PdError::UnrecognizedCommand)),
+            controller::Command::Lpm(_) => controller::Response::Ucsi(ucsi::Response {
+                cci: ucsi::cci::Cci::new_error(),
+                data: None,
+            }),
         }
     }
 }