addressed review comments

OpenDevicePartnership · Nov 8, 2024 · 20fa507 · 20fa507
1 parent 0167142
commit 20fa507
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/examples/rt685s-evk/src/bin/gpio-blinky.rs b/examples/rt685s-evk/src/bin/gpio-blinky.rs
@@ -18,7 +18,10 @@ async fn main(_spawner: Spawner) {
 
     let cc1 = unsafe { pac::Clkctl1::steal() };
 
-    assert!(cc1.pscctl1().read().hsgpio0_clk().is_disable_clock());
+    assert!(
+        cc1.pscctl1().read().hsgpio0_clk().is_disable_clock(),
+        "GPIO port 0 clock was enabled before any GPIO pins were created!"
+    );
 
     let mut led = gpio::Output::new(
         p.PIO0_26,
@@ -28,7 +31,10 @@ async fn main(_spawner: Spawner) {
         gpio::SlewRate::Standard,
     );
 
-    assert!(cc1.pscctl1().read().hsgpio0_clk().is_enable_clock());
+    assert!(
+        cc1.pscctl1().read().hsgpio0_clk().is_enable_clock(),
+        "GPIO port 0 clock is still disabled even after a GPIO pin is created!"
+    );
 
     loop {
         info!("Toggling LED");

diff --git a/examples/rt685s-evk/src/bin/gpio-flex.rs b/examples/rt685s-evk/src/bin/gpio-flex.rs
@@ -99,9 +99,6 @@ async fn main(_spawner: Spawner) {
     // check pin level is low
     assert!(flex.is_low());
 
-    let mut flex = flex.disable_sensing();
-
-    let mut flex = flex.enable_sensing();
     // toggle pin
     flex.toggle();
 

diff --git a/src/gpio.rs b/src/gpio.rs
@@ -258,7 +258,7 @@ impl<S: Sense> Drop for Flex<'_, S> {
         let port = self.pin.port();
 
         let is_last_drop = critical_section::with(|_| {
-            // Safe since we are using an atomic load and stores.
+            // SAFETY: Safe since we are using an atomic load and stores.
             let usecount = unsafe { PORT_USECOUNT[port].usecount.load(core::sync::atomic::Ordering::Acquire) };
             assert!(usecount >= 1);
             unsafe {
@@ -279,7 +279,7 @@ impl<S: Sense> Drop for Flex<'_, S> {
                 5 => disable::<peripherals::HSGPIO5>(),
                 6 => disable::<peripherals::HSGPIO6>(),
                 7 => disable::<peripherals::HSGPIO7>(),
-                _ => panic!(),
+                _ => (),
             }
         }
     }
@@ -296,7 +296,7 @@ impl<'d> Flex<'d, SenseEnabled> {
 
         let port = pin.port();
         let is_first_construct = critical_section::with(|_| {
-            // Safe since we are using an atomic load and stores.
+            // SAFETY: Safe since we are using an atomic load and stores.
             let usecount = unsafe { PORT_USECOUNT[port].usecount.load(core::sync::atomic::Ordering::Acquire) };
             unsafe {
                 PORT_USECOUNT[port]
@@ -315,7 +315,7 @@ impl<'d> Flex<'d, SenseEnabled> {
                 5 => enable_and_reset::<peripherals::HSGPIO5>(),
                 6 => enable_and_reset::<peripherals::HSGPIO6>(),
                 7 => enable_and_reset::<peripherals::HSGPIO7>(),
-                _ => panic!(),
+                _ => (),
             }
         }
 
@@ -422,7 +422,7 @@ impl<'d> Flex<'d, SenseDisabled> {
 
         let port = pin.port();
         let is_first_construct = critical_section::with(|_| {
-            // Safe since we are using an atomic load and stores.
+            // SAFETY: Safe since we are using an atomic load and stores.
             let usecount = unsafe { PORT_USECOUNT[port].usecount.load(core::sync::atomic::Ordering::Acquire) };
             unsafe {
                 PORT_USECOUNT[port]
@@ -441,7 +441,7 @@ impl<'d> Flex<'d, SenseDisabled> {
                 5 => enable_and_reset::<peripherals::HSGPIO5>(),
                 6 => enable_and_reset::<peripherals::HSGPIO6>(),
                 7 => enable_and_reset::<peripherals::HSGPIO7>(),
-                _ => panic!(),
+                _ => (),
             }
         }