chore(exti): use ll to get pull config

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

cores/arduino/WInterrupts.cpp

@@ -27,10 +27,6 @@ void attachInterrupt(uint32_t pin, callback_function_t callback, uint32_t mode)
 #if !defined(HAL_EXTI_MODULE_DISABLED)
   uint32_t it_mode;
   PinName p = digitalPinToPinName(pin);
-  GPIO_TypeDef *port = set_GPIO_Port_Clock(STM_PORT(p));
-  if (!port) {
-    return;
-  }
 
   switch (mode) {
     case CHANGE :
@@ -53,7 +49,7 @@ void attachInterrupt(uint32_t pin, callback_function_t callback, uint32_t mode)
   pinF1_DisconnectDebug(p);
 #endif /* STM32F1xx */
 
-  stm32_interrupt_enable(port, STM_GPIO_PIN(p), callback, it_mode);
+  stm32_interrupt_enable(p, callback, it_mode);
 #else
   UNUSED(pin);
   UNUSED(callback);

libraries/SrcWrapper/inc/interrupt.h

@@ -41,6 +41,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_def.h"
+#include "pinmap.h"
 
 #if !defined(HAL_EXTI_MODULE_DISABLED)
 
@@ -63,11 +64,11 @@
     #include <functional>
 
     typedef std::function<void(void)> callback_function_t;
-    void stm32_interrupt_enable(GPIO_TypeDef *port, uint16_t pin, callback_function_t callback, uint32_t mode);
+    void stm32_interrupt_enable(PinName pn, callback_function_t callback, uint32_t mode);
   #endif
 
   /* Exported functions ------------------------------------------------------- */
-  void stm32_interrupt_enable(GPIO_TypeDef *port, uint16_t pin, void (*callback)(void), uint32_t mode);
+  void stm32_interrupt_enable(PinName pn, void (*callback)(void), uint32_t mode);
   void stm32_interrupt_disable(GPIO_TypeDef *port, uint16_t pin);
 #endif /* !HAL_EXTI_MODULE_DISABLED */
 

libraries/SrcWrapper/src/stm32/interrupt.cpp

@@ -38,6 +38,8 @@
 #include "interrupt.h"
 #include "lock_resource.h"
 #include "stm32yyxx_ll_exti.h"
+#include "stm32yyxx_ll_gpio.h"
+
 #if !defined(HAL_EXTI_MODULE_DISABLED)
 
 /* Private Types */
@@ -133,68 +135,24 @@ static uint8_t get_pin_id(uint16_t pin)
 
   return id;
 }
-void stm32_interrupt_enable(GPIO_TypeDef *port, uint16_t pin, callback_function_t callback, uint32_t mode)
+
+void stm32_interrupt_enable(PinName pn, callback_function_t callback, uint32_t mode)
 {
   GPIO_InitTypeDef GPIO_InitStruct;
+  uint16_t pin = STM_GPIO_PIN(pn);
   uint8_t id = get_pin_id(pin);
-
-#ifdef STM32F1xx
-  uint8_t position;
-  uint32_t CRxRegOffset = 0;
-  uint32_t ODRRegOffset = 0;
-  volatile uint32_t *CRxRegister;
-  const uint32_t ConfigMask = 0x00000008; //MODE0 == 0x0 && CNF0 == 0x2
-#else
-  uint32_t pull;
-#endif /* STM32F1xx */
-
-  // GPIO pin configuration
-  GPIO_InitStruct.Pin       = pin;
-  GPIO_InitStruct.Mode      = mode;
-
-  //read the pull mode directly in the register as no function exists to get it.
-  //Do it in case the user already defines the IO through the digital io
-  //interface
-#ifndef STM32F1xx
-  pull = port->PUPDR;
-#ifdef GPIO_PUPDR_PUPD0
-  pull &= (GPIO_PUPDR_PUPD0 << (id * 2));
-  GPIO_InitStruct.Pull = (GPIO_PUPDR_PUPD0 & (pull >> (id * 2)));
-#else
-  pull &= (GPIO_PUPDR_PUPDR0 << (id * 2));
-  GPIO_InitStruct.Pull = (GPIO_PUPDR_PUPDR0 & (pull >> (id * 2)));
-#endif /* GPIO_PUPDR_PUPD0 */
-#else
-  CRxRegister = (pin < GPIO_PIN_8) ? &port->CRL : &port->CRH;
-
-  for (position = 0; position < 16; position++) {
-    if (pin == (0x0001 << position)) {
-      CRxRegOffset = (pin < GPIO_PIN_8) ? (position << 2) : ((position - 8) << 2);
-      ODRRegOffset = position;
-    }
+  GPIO_TypeDef *port = set_GPIO_Port_Clock(STM_PORT(pn));
+  if (port) {
+    // GPIO pin configuration
+    GPIO_InitStruct.Pin       = pin;
+    GPIO_InitStruct.Mode      = mode;
+    GPIO_InitStruct.Pull      = LL_GPIO_GetPinPull(port, STM_LL_GPIO_PIN(pn));
+    GPIO_InitStruct.Speed     = GPIO_SPEED_FREQ_HIGH;
+    hsem_lock(CFG_HW_GPIO_SEMID, HSEM_LOCK_DEFAULT_RETRY);
+    HAL_GPIO_Init(port, &GPIO_InitStruct);
+    hsem_unlock(CFG_HW_GPIO_SEMID);
   }
-
-  if ((*CRxRegister & ((GPIO_CRL_MODE0 | GPIO_CRL_CNF0) << CRxRegOffset)) == (ConfigMask << CRxRegOffset)) {
-    if ((port->ODR & (GPIO_ODR_ODR0 << ODRRegOffset)) == (GPIO_ODR_ODR0 << ODRRegOffset)) {
-      GPIO_InitStruct.Pull = GPIO_PULLUP;
-    } else {
-      GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-    }
-  } else {
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-  }
-#endif /* STM32F1xx */
-
-  GPIO_InitStruct.Speed     = GPIO_SPEED_FREQ_HIGH;
-
-  hsem_lock(CFG_HW_GPIO_SEMID, HSEM_LOCK_DEFAULT_RETRY);
-
-  HAL_GPIO_Init(port, &GPIO_InitStruct);
-
-  hsem_unlock(CFG_HW_GPIO_SEMID);
-
   gpio_irq_conf[id].callback = callback;
-
   // Enable and set EXTI Interrupt
   HAL_NVIC_SetPriority(gpio_irq_conf[id].irqnb, EXTI_IRQ_PRIO, EXTI_IRQ_SUBPRIO);
   HAL_NVIC_EnableIRQ(gpio_irq_conf[id].irqnb);
@@ -208,10 +166,10 @@ void stm32_interrupt_enable(GPIO_TypeDef *port, uint16_t pin, callback_function_
   * @param  mode : one of the supported interrupt mode defined in stm32_hal_gpio
   * @retval None
   */
-void stm32_interrupt_enable(GPIO_TypeDef *port, uint16_t pin, void (*callback)(void), uint32_t mode)
+void stm32_interrupt_enable(PinName pn, void (*callback)(void), uint32_t mode)
 {
   std::function<void(void)> _c = callback;
-  stm32_interrupt_enable(port, pin, _c, mode);
+  stm32_interrupt_enable(pn, _c, mode);
 
 }
 
@@ -226,14 +184,12 @@ void stm32_interrupt_disable(GPIO_TypeDef *port, uint16_t pin)
   UNUSED(port);
   uint8_t id = get_pin_id(pin);
   gpio_irq_conf[id].callback = NULL;
-
   for (int i = 0; i < NB_EXTI; i++) {
     if (gpio_irq_conf[id].irqnb == gpio_irq_conf[i].irqnb
         && gpio_irq_conf[i].callback != NULL) {
       return;
     }
   }
-
   LL_EXTI_DisableIT_0_31(ll_exti_lines[id]);
   HAL_NVIC_DisableIRQ(gpio_irq_conf[id].irqnb);
 }