Rework the sequence of GPIO registers in stm32l0_gpio_pin_configure t…

…o avoid suprious edges
GrumpyOldPizza · Feb 4, 2019 · 1dffebd · 1dffebd
1 parent 45b40b9
commit 1dffebd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 24 deletions.
diff --git a/system/STM32L0xx/Lib/libstm32l052xx.a b/system/STM32L0xx/Lib/libstm32l052xx.a
diff --git a/system/STM32L0xx/Lib/libstm32l072xx.a b/system/STM32L0xx/Lib/libstm32l072xx.a
diff --git a/system/STM32L0xx/Lib/libstm32l082xx.a b/system/STM32L0xx/Lib/libstm32l082xx.a
diff --git a/system/STM32L0xx/Source/stm32l0_gpio.c b/system/STM32L0xx/Source/stm32l0_gpio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 Thomas Roell.  All rights reserved.
+ * Copyright (c) 2014-2019 Thomas Roell.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -103,37 +103,52 @@ void stm32l0_gpio_pin_configure(unsigned int pin, unsigned int mode)
     RCC->IOPENR |= (RCC_IOPENR_IOPAEN << group);
     RCC->IOPENR;
 
-    /* First switch the pin back to analog mode */
-    GPIO->MODER |= (0x00000003 << (index << 1));
-
-    /* Set OPTYPER */
-    GPIO->OTYPER = (GPIO->OTYPER & ~(0x00000001 << index)) | (((mode & STM32L0_GPIO_OTYPE_MASK) >> STM32L0_GPIO_OTYPE_SHIFT) << index);
-
-    /* Set OPSPEEDR */
-    GPIO->OSPEEDR = (GPIO->OSPEEDR & ~(0x00000003 << (index << 1))) | (((mode & STM32L0_GPIO_OSPEED_MASK) >> STM32L0_GPIO_OSPEED_SHIFT) << (index << 1));
-
-    /* Set PUPD */
-    GPIO->PUPDR = (GPIO->PUPDR & ~(0x00000003 << (index << 1))) | (((mode & STM32L0_GPIO_PUPD_MASK) >> STM32L0_GPIO_PUPD_SHIFT) << (index << 1));
-
-    /* Set AFRL/AFRH */
-    GPIO->AFR[index >> 3] = (GPIO->AFR[index >> 3] & ~(0x0000000f << ((index & 7) << 2))) | (afsel << ((index & 7) << 2));
-
-    GPIO->MODER = (GPIO->MODER & ~(0x00000003 << (index << 1))) | (((mode & STM32L0_GPIO_MODE_MASK) >> STM32L0_GPIO_MODE_SHIFT) << (index << 1));
-
-    // if ((((mode & STM32L0_GPIO_MODE_MASK) >> STM32L0_GPIO_MODE_SHIFT) == STM32L0_GPIO_MODE_INPUT) || (((mode & STM32L0_GPIO_MODE_MASK) >> STM32L0_GPIO_MODE_SHIFT) == STM32L0_GPIO_MODE_OUTPUT))
-    if (((mode & STM32L0_GPIO_MODE_MASK) >> STM32L0_GPIO_MODE_SHIFT) != STM32L0_GPIO_MODE_ANALOG)
-    {
-        stm32l0_gpio_device.enables[port] |= (1 << index);
-    }
-    else
+    /* If the mode is ANALOG, set MODER first */
+    if (((mode & STM32L0_GPIO_MODE_MASK) >> STM32L0_GPIO_MODE_SHIFT) == STM32L0_GPIO_MODE_ANALOG)
     {
+        GPIO->MODER |= (0x00000003 << (index << 1));
+
         stm32l0_gpio_device.enables[port] &= ~(1 << index);
 
         if (!stm32l0_gpio_device.enables[port])
         {
             RCC->IOPENR &= ~(RCC_IOPENR_IOPAEN << group);
         }
     }
+    else
+    {
+        /* Set AFRL/AFRH */
+        GPIO->AFR[index >> 3] = (GPIO->AFR[index >> 3] & ~(0x0000000f << ((index & 7) << 2))) | (afsel << ((index & 7) << 2));
+
+        /* Set OPSPEEDR */
+        GPIO->OSPEEDR = (GPIO->OSPEEDR & ~(0x00000003 << (index << 1))) | (((mode & STM32L0_GPIO_OSPEED_MASK) >> STM32L0_GPIO_OSPEED_SHIFT) << (index << 1));
+
+        /* Set OPTYPER */
+        GPIO->OTYPER = (GPIO->OTYPER & ~(0x00000001 << index)) | (((mode & STM32L0_GPIO_OTYPE_MASK) >> STM32L0_GPIO_OTYPE_SHIFT) << index);
+
+        /* If the mode is OUTPUT, or OUTPUT OPENDRAIN with a ODR of 0. then first switch MODER and then PUPDR
+         * to avoid spurious edges. N.b. ALTERNATE is assumed to be INPUT before the peripheral drives it.
+         */ 
+        if (((mode & STM32L0_GPIO_MODE_MASK) == STM32L0_GPIO_MODE_OUTPUT) &&
+            (((mode & STM32L0_GPIO_OTYPE_MASK) != STM32L0_GPIO_OTYPE_OPENDRAIN) || !(GPIO->ODR & (0x00000001 << index))))
+        {
+            /* Set MODE */
+            GPIO->MODER = (GPIO->MODER & ~(0x00000003 << (index << 1))) | (((mode & STM32L0_GPIO_MODE_MASK) >> STM32L0_GPIO_MODE_SHIFT) << (index << 1));
+
+            /* Set PUPD */
+            GPIO->PUPDR = (GPIO->PUPDR & ~(0x00000003 << (index << 1))) | (((mode & STM32L0_GPIO_PUPD_MASK) >> STM32L0_GPIO_PUPD_SHIFT) << (index << 1));
+        }
+        else
+        {
+            /* Set PUPD */
+            GPIO->PUPDR = (GPIO->PUPDR & ~(0x00000003 << (index << 1))) | (((mode & STM32L0_GPIO_PUPD_MASK) >> STM32L0_GPIO_PUPD_SHIFT) << (index << 1));
+
+            /* Set MODE */
+            GPIO->MODER = (GPIO->MODER & ~(0x00000003 << (index << 1))) | (((mode & STM32L0_GPIO_MODE_MASK) >> STM32L0_GPIO_MODE_SHIFT) << (index << 1));
+        }
+
+        stm32l0_gpio_device.enables[port] |= (1 << index);
+    }
 
     stm32l0_gpio_device.mode[port] &= ~(0x00000003 << (index << 1));
     stm32l0_gpio_device.pupd[port] &= ~(0x00000003 << (index << 1));