stm32/i2c: Rename irq handler function.

Signed-off-by: Damien George <[email protected]>

Author: dpgeorge

ports/stm32/i2c.c

@@ -595,19 +595,21 @@ int i2c_find_peripheral(mp_obj_t id) {
     return i2c_id;
 }
 
-#if MICROPY_PY_PYB_LEGACY
+#if MICROPY_HW_ENABLE_HW_I2C_TARGET || MICROPY_PY_PYB_LEGACY
 
 #if defined(MICROPY_HW_I2C1_SCL)
 void I2C1_EV_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C1_EV_IRQn > 0);
     IRQ_ENTER(I2C1_EV_IRQn);
     #if MICROPY_HW_ENABLE_HW_I2C_TARGET
     if (i2c_target_enabled & 1) {
-        i2c_slave_ev_irq_handler(I2C1);
+        i2c_slave_irq_handler(I2C1);
     } else
     #endif
     {
+        #if MICROPY_PY_PYB_LEGACY
         i2c_ev_irq_handler(1);
+        #endif
     }
     IRQ_EXIT(I2C1_EV_IRQn);
 }
@@ -617,11 +619,13 @@ void I2C1_ER_IRQHandler(void) {
     IRQ_ENTER(I2C1_ER_IRQn);
     #if MICROPY_HW_ENABLE_HW_I2C_TARGET
     if (i2c_target_enabled & 1) {
-        i2c_slave_ev_irq_handler(I2C1);
+        i2c_slave_irq_handler(I2C1);
     } else
     #endif
     {
+        #if MICROPY_PY_PYB_LEGACY
         i2c_er_irq_handler(1);
+        #endif
     }
     IRQ_EXIT(I2C1_ER_IRQn);
 }
@@ -633,19 +637,30 @@ void I2C2_EV_IRQHandler(void) {
     IRQ_ENTER(I2C2_EV_IRQn);
     #if MICROPY_HW_ENABLE_HW_I2C_TARGET
     if (i2c_target_enabled & 2) {
-        i2c_slave_ev_irq_handler(I2C2);
+        i2c_slave_irq_handler(I2C2);
     } else
     #endif
     {
+        #if MICROPY_PY_PYB_LEGACY
         i2c_ev_irq_handler(2);
+        #endif
     }
     IRQ_EXIT(I2C2_EV_IRQn);
 }
 
 void I2C2_ER_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C2_ER_IRQn > 0);
     IRQ_ENTER(I2C2_ER_IRQn);
-    i2c_er_irq_handler(2);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 2) {
+        i2c_slave_irq_handler(I2C2);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_er_irq_handler(2);
+        #endif
+    }
     IRQ_EXIT(I2C2_ER_IRQn);
 }
 #endif // defined(MICROPY_HW_I2C2_SCL)
@@ -656,19 +671,30 @@ void I2C3_EV_IRQHandler(void) {
     IRQ_ENTER(I2C3_EV_IRQn);
     #if MICROPY_HW_ENABLE_HW_I2C_TARGET
     if (i2c_target_enabled & 4) {
-        i2c_slave_ev_irq_handler(I2C3);
+        i2c_slave_irq_handler(I2C3);
     } else
     #endif
     {
+        #if MICROPY_PY_PYB_LEGACY
         i2c_ev_irq_handler(3);
+        #endif
     }
     IRQ_EXIT(I2C3_EV_IRQn);
 }
 
 void I2C3_ER_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C3_ER_IRQn > 0);
     IRQ_ENTER(I2C3_ER_IRQn);
-    i2c_er_irq_handler(3);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 4) {
+        i2c_slave_irq_handler(I2C3);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_er_irq_handler(3);
+        #endif
+    }
     IRQ_EXIT(I2C3_ER_IRQn);
 }
 #endif // defined(MICROPY_HW_I2C3_SCL)
@@ -679,19 +705,30 @@ void I2C4_EV_IRQHandler(void) {
     IRQ_ENTER(I2C4_EV_IRQn);
     #if MICROPY_HW_ENABLE_HW_I2C_TARGET
     if (i2c_target_enabled & 8) {
-        i2c_slave_ev_irq_handler(I2C4);
+        i2c_slave_irq_handler(I2C4);
     } else
     #endif
     {
+        #if MICROPY_PY_PYB_LEGACY
         i2c_ev_irq_handler(4);
+        #endif
     }
     IRQ_EXIT(I2C4_EV_IRQn);
 }
 
 void I2C4_ER_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C4_ER_IRQn > 0);
     IRQ_ENTER(I2C4_ER_IRQn);
-    i2c_er_irq_handler(4);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 8) {
+        i2c_slave_irq_handler(I2C4);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_er_irq_handler(4);
+        #endif
+    }
     IRQ_EXIT(I2C4_ER_IRQn);
 }
 #endif // defined(MICROPY_HW_I2C4_SCL)

ports/stm32/i2cslave.c

@@ -41,7 +41,7 @@ void i2c_slave_init_helper(i2c_slave_t *i2c, int addr) {
     i2c->CR1 = I2C_CR1_ACK | I2C_CR1_PE;
 }
 
-void i2c_slave_ev_irq_handler(i2c_slave_t *i2c) {
+void i2c_slave_irq_handler(i2c_slave_t *i2c) {
     uint32_t sr1 = i2c->SR1;
 
     // Clear all error flags.
@@ -86,7 +86,7 @@ void i2c_slave_init_helper(i2c_slave_t *i2c, int addr) {
     i2c->CR1 |= I2C_CR1_PE;
 }
 
-void i2c_slave_ev_irq_handler(i2c_slave_t *i2c) {
+void i2c_slave_irq_handler(i2c_slave_t *i2c) {
     uint32_t isr = i2c->ISR;
     if (isr & I2C_ISR_ADDR) {
         // Address matched

ports/stm32/i2cslave.h

@@ -96,7 +96,7 @@ static inline uint8_t i2c_slave_read_byte(i2c_slave_t *i2c) {
     #endif
 }
 
-void i2c_slave_ev_irq_handler(i2c_slave_t *i2c);
+void i2c_slave_irq_handler(i2c_slave_t *i2c);
 
 // These should be provided externally
 int i2c_slave_process_addr_match(i2c_slave_t *i2c, int rw);