pexperimental change + test fix

Author: Legorooj

embassy-stm32/src/hsem.rs

@@ -11,6 +11,7 @@ pub struct HsemLockFailed;
 ///
 /// On some chips, the Reference Manual calls this value MASTERID instead of COREID.
 #[repr(u8)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum CoreId {
     #[cfg(any(stm32h7a3, stm32h7b3, stm32h7b0))]
     /// Cortex-M7, core 1. MASTERID = 1
@@ -37,12 +38,19 @@ pub enum CoreId {
 }
 
 impl CoreId {
-    #[cfg(any(feature = "_core-cm7", not(feature = "_core-cm4")))]
+    #[cfg(any(
+        all(stm32wl, feature = "_core-cm4"),
+        feature = "_core-cm7", 
+        not(feature = "_core-cm4")
+    ))]
     const fn current() -> CoreId {
         CoreId::Core0
     }
 
-    #[cfg(feature = "_core-cm4")]
+    #[cfg(any(
+        all(not(stm32wl), feature = "_core-cm4"),
+        all(stm32wl, feature = "_core-cm0p")
+    ))]
     const fn current() -> CoreId {
         CoreId::Core1
     }
@@ -86,7 +94,10 @@ impl<'d> HardwareSemaphore<'d> {
             reg.procid() == process_id,
         ) {
             (true, true, true) => Ok(()),
-            _ => Err(HsemLockFailed),
+            v => {
+                error!("{}: {}", v, CoreId::current() as u8);
+                Err(HsemLockFailed)
+            }
         }
     }
 
@@ -97,9 +108,12 @@ impl<'d> HardwareSemaphore<'d> {
     pub fn one_step_lock(&mut self, sem_id: u8) -> Result<(), HsemLockFailed> {
         let reg = HSEM.rlr(sem_id as usize).read();
 
-        match (reg.lock(), reg.coreid() == CoreId::current() as u8, reg.procid()) {
+        match (reg.lock(), reg.coreid() == CoreId::current() as u8, reg.procid()) { 
             (_, true, 0) => Ok(()),
-            _ => Err(HsemLockFailed),
+            v => {
+                error!("{}: Current: {} Actual: {}", v, CoreId::current() as u8, reg.coreid());
+                Err(HsemLockFailed)
+            }
         }
     }
 

tests/stm32/src/bin/hsem.rs

@@ -14,7 +14,12 @@ async fn main(_spawner: Spawner) {
     let p: embassy_stm32::Peripherals = init();
 
     let mut hsem = HardwareSemaphore::new(p.HSEM);
-    hsem.one_step_lock(1).unwrap();
+
+    if hsem.is_semaphore_locked(5) {
+        defmt::panic!("Semaphore 5 already locked!")
+    }
+
+    hsem.one_step_lock(5).unwrap();
     hsem.two_step_lock(1, 0).unwrap();
 
     info!("Test OK");