[UCPD] Split into CC and PD phy

PD3.0 spec requires concurrent control of CC resistors for collision avoidance.
Needed to introduce some "ref counting" (its just a bool) for drop code.

1 files changed, 9 insertions, 8 deletions

diff --git a/examples/stm32g4/src/bin/usb_c_pd.rs b/examples/stm32g4/src/bin/usb_c_pd.rs
index 14abd542f..0e80840df 100644
--- a/examples/stm32g4/src/bin/usb_c_pd.rs
+++ b/examples/stm32g4/src/bin/usb_c_pd.rs
@@ -3,7 +3,7 @@
 
 use defmt::{error, info, Format};
 use embassy_executor::Spawner;
-use embassy_stm32::ucpd::{self, CcPull, CcSel, CcVState, Ucpd};
+use embassy_stm32::ucpd::{self, CcPhy, CcPull, CcSel, CcVState, Ucpd};
 use embassy_stm32::Config;
 use embassy_time::{with_timeout, Duration};
 use {defmt_rtt as _, panic_probe as _};
@@ -16,17 +16,17 @@ enum CableOrientation {
 }
 
 // Returns true when the cable
-async fn wait_attached<T: ucpd::Instance>(ucpd: &mut Ucpd<'_, T>) -> CableOrientation {
+async fn wait_attached<T: ucpd::Instance>(cc_phy: &mut CcPhy<'_, T>) -> CableOrientation {
     loop {
-        let (cc1, cc2) = ucpd.cc_vstate();
+        let (cc1, cc2) = cc_phy.vstate();
         if cc1 == CcVState::LOWEST && cc2 == CcVState::LOWEST {
             // Detached, wait until attached by monitoring the CC lines.
-            ucpd.wait_for_cc_vstate_change().await;
+            cc_phy.wait_for_vstate_change().await;
             continue;
         }
 
         // Attached, wait for CC lines to be stable for tCCDebounce (100..200ms).
-        if with_timeout(Duration::from_millis(100), ucpd.wait_for_cc_vstate_change())
+        if with_timeout(Duration::from_millis(100), cc_phy.wait_for_vstate_change())
             .await
             .is_ok()
         {
@@ -50,10 +50,11 @@ async fn main(_spawner: Spawner) {
 
     info!("Hello World!");
 
-    let mut ucpd = Ucpd::new(p.UCPD1, p.PB6, p.PB4, CcPull::Sink);
+    let mut ucpd = Ucpd::new(p.UCPD1, p.PB6, p.PB4);
+    ucpd.cc_phy().set_pull(CcPull::Sink);
 
     info!("Waiting for USB connection...");
-    let cable_orientation = wait_attached(&mut ucpd).await;
+    let cable_orientation = wait_attached(ucpd.cc_phy()).await;
     info!("USB cable connected, orientation: {}", cable_orientation);
 
     let cc_sel = match cable_orientation {
@@ -67,7 +68,7 @@ async fn main(_spawner: Spawner) {
         }
         CableOrientation::DebugAccessoryMode => panic!("No PD communication in DAM"),
     };
-    let mut pd_phy = ucpd.pd_phy(p.DMA1_CH1, p.DMA1_CH2, cc_sel);
+    let (_cc_phy, mut pd_phy) = ucpd.split_pd_phy(p.DMA1_CH1, p.DMA1_CH2, cc_sel);
 
     loop {
         // Enough space for the longest non-extended data message.