From 16feb88c2dc82420390b56226e8fe7cbc49aeb3b Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 13 May 2011 09:03:46 +0000
Subject: Fixed STM8S SPI driver. Fixed STM32 DMA2 channels 4 and 5 sharing.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2949 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/platforms/STM32/stm32_dma.c | 34 ++++++++++++++++++++++++++++++++++
 os/hal/platforms/STM8S/spi_lld.c   |  6 ++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

(limited to 'os/hal')

diff --git a/os/hal/platforms/STM32/stm32_dma.c b/os/hal/platforms/STM32/stm32_dma.c
index 621659a0b..2232df448 100644
--- a/os/hal/platforms/STM32/stm32_dma.c
+++ b/os/hal/platforms/STM32/stm32_dma.c
@@ -251,6 +251,7 @@ CH_IRQ_HANDLER(DMA2_Ch3_IRQHandler) {
   CH_IRQ_EPILOGUE();
 }
 
+#if defined(STM32F10X_CL) || defined(__DOXYGEN__)
 /**
  * @brief   DMA2 channel 4 shared interrupt handler.
  *
@@ -286,6 +287,39 @@ CH_IRQ_HANDLER(DMA2_Ch5_IRQHandler) {
 
   CH_IRQ_EPILOGUE();
 }
+
+#else /* !STM32F10X_CL */
+/**
+ * @brief   DMA2 channels 4 and 5 shared interrupt handler.
+ * @note    This IRQ is shared between DMA2 channels 4 and 5 so it is a
+ *          bit less efficient because an extra check.
+ *
+ * @isr
+ */
+CH_IRQ_HANDLER(DMA2_Ch4_5_IRQHandler) {
+  uint32_t isr;
+
+  CH_IRQ_PROLOGUE();
+
+  /* Check on channel 4.*/
+  isr = STM32_DMA2->ISR >> (STM32_DMA_CHANNEL_5 * 4);
+  if (isr & DMA_ISR_GIF1) {
+    dmaClearChannel(STM32_DMA2, STM32_DMA_CHANNEL_5);
+    if (dma2[3].dmaisrfunc)
+      dma2[3].dmaisrfunc(dma2[3].dmaisrparam, isr);
+  }
+
+  /* Check on channel 5.*/
+  isr = STM32_DMA2->ISR >> (STM32_DMA_CHANNEL_4 * 4);
+  if (isr & DMA_ISR_GIF1) {
+    dmaClearChannel(STM32_DMA2, STM32_DMA_CHANNEL_5);
+    if (dma2[4].dmaisrfunc)
+      dma2[4].dmaisrfunc(dma2[4].dmaisrparam, isr);
+  }
+
+  CH_IRQ_EPILOGUE();
+}
+#endif /* !STM32F10X_CL */
 #endif /* STM32_HAS_DMA2 */
 
 /*===========================================================================*/
diff --git a/os/hal/platforms/STM8S/spi_lld.c b/os/hal/platforms/STM8S/spi_lld.c
index f9af72cde..57e459d80 100644
--- a/os/hal/platforms/STM8S/spi_lld.c
+++ b/os/hal/platforms/STM8S/spi_lld.c
@@ -130,8 +130,10 @@ void spi_lld_start(SPIDriver *spip) {
   CLK->PCKENR1 |= CLK_PCKENR1_SPI;              /* PCKEN11, clock source.   */
 
   /* Configuration.*/
-  SPI->CR2 = 0;
-  SPI->CR1 = spip->config->cr1 | SPI_CR1_MSTR | SPI_CR1_SPE;
+  SPI->CR1  = 0;
+  SPI->CR1  = spip->config->cr1 | SPI_CR1_MSTR;
+  SPI->CR2  = SPI_CR2_SSI | SPI_CR2_SSM;
+  SPI->CR1 |= SPI_CR1_SPE;
 }
 
 /**
-- 
cgit v1.2.3