Correct SPI state machine for disable()

GrumpyOldPizza · Oct 4, 2017 · bacc184 · bacc184
1 parent 7ab6adc
commit bacc184
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/system/STM32L4xx/Lib/libstm32l432.a b/system/STM32L4xx/Lib/libstm32l432.a
diff --git a/system/STM32L4xx/Lib/libstm32l433.a b/system/STM32L4xx/Lib/libstm32l433.a
diff --git a/system/STM32L4xx/Lib/libstm32l476.a b/system/STM32L4xx/Lib/libstm32l476.a
diff --git a/system/STM32L4xx/Lib/libstm32l496.a b/system/STM32L4xx/Lib/libstm32l496.a
diff --git a/system/STM32L4xx/Source/stm32l4_sai.c b/system/STM32L4xx/Source/stm32l4_sai.c
@@ -702,7 +702,7 @@ bool stm32l4_sai_disable(stm32l4_sai_t *sai)
 	stm32l4_gpio_pin_configure(sai->pins.mck, (GPIO_PUPD_NONE | GPIO_MODE_ANALOG));
     }
 
-    sai->state = SAI_STATE_NONE;
+    sai->state = SAI_STATE_INIT;
 
     return true;
 }

diff --git a/system/STM32L4xx/Source/stm32l4_spi.c b/system/STM32L4xx/Source/stm32l4_spi.c
@@ -944,8 +944,6 @@ bool stm32l4_spi_disable(stm32l4_spi_t *spi)
 	return false;
     }
 
-    spi->state = SPI_STATE_NONE;
-
     stm32l4_gpio_pin_configure(spi->pins.mosi, (GPIO_PUPD_NONE | GPIO_MODE_ANALOG));
 
     if (spi->pins.miso != GPIO_PIN_NONE)
@@ -960,6 +958,8 @@ bool stm32l4_spi_disable(stm32l4_spi_t *spi)
 	stm32l4_gpio_pin_configure(spi->pins.ss, (GPIO_PUPD_NONE | GPIO_MODE_ANALOG));
     }
 
+    spi->state = SPI_STATE_INIT;
+
     return true;
 }