i2c: i2c1_handler used I2C0 register block by mistake (#1487)

* i2c: i2c1_handler used I2C0 register block by mistake * update CHANGELOG
esp-rs · Apr 22, 2024 · 5f79be6 · 5f79be6
1 parent 4d44f41
commit 5f79be6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/esp-hal/CHANGELOG.md b/esp-hal/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- i2c: i2c1_handler used I2C0 register block by mistake (#1487)
+
 ### Changed
 
 ### Removed

diff --git a/esp-hal/src/i2c.rs b/esp-hal/src/i2c.rs
@@ -705,29 +705,25 @@ mod asynch {
 
     #[handler]
     pub(super) fn i2c0_handler() {
-        unsafe { &*crate::peripherals::I2C0::PTR }
-            .int_ena()
+        let regs = unsafe { &*crate::peripherals::I2C0::PTR };
+        regs.int_ena()
             .modify(|_, w| w.end_detect().clear_bit().trans_complete().clear_bit());
 
         #[cfg(not(any(esp32, esp32s2)))]
-        unsafe { &*crate::peripherals::I2C0::PTR }
-            .int_ena()
-            .modify(|_, w| w.txfifo_wm().clear_bit());
+        regs.int_ena().modify(|_, w| w.txfifo_wm().clear_bit());
 
         WAKERS[0].wake();
     }
 
     #[cfg(i2c1)]
     #[handler]
     pub(super) fn i2c1_handler() {
-        unsafe { &*crate::peripherals::I2C1::PTR }
-            .int_ena()
+        let regs = unsafe { &*crate::peripherals::I2C1::PTR };
+        regs.int_ena()
             .modify(|_, w| w.end_detect().clear_bit().trans_complete().clear_bit());
 
         #[cfg(not(any(esp32, esp32s2)))]
-        unsafe { &*crate::peripherals::I2C0::PTR }
-            .int_ena()
-            .modify(|_, w| w.txfifo_wm().clear_bit());
+        regs.int_ena().modify(|_, w| w.txfifo_wm().clear_bit());
 
         WAKERS[1].wake();
     }