git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4232 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 125 insertions, 4 deletions

diff --git a/os/hal/platforms/STM32/serial_lld.c b/os/hal/platforms/STM32/serial_lld.c
index a93d36523..fdb99cbc8 100644
--- a/os/hal/platforms/STM32/serial_lld.c
+++ b/os/hal/platforms/STM32/serial_lld.c
@@ -82,6 +82,129 @@ static const SerialConfig default_config =
 /* Driver local functions.                                                   */

 /*===========================================================================*/

 

+/* Local functions have different implementations depending on the USART type,

+   STM32F0xx devices and newer have and enhanced peripheral with slightly

+   different register interface.*/

+

+#if defined(STM32F0XX)

+

+/**

+ * @brief   USART initialization.

+ * @details This function must be invoked with interrupts disabled.

+ *

+ * @param[in] sdp       pointer to a @p SerialDriver object

+ * @param[in] config    the architecture-dependent serial driver configuration

+ */

+static void usart_init(SerialDriver *sdp, const SerialConfig *config) {

+  USART_TypeDef *u = sdp->usart;

+

+  /*

+   * Baud rate setting.

+   */

+  if (sdp->usart == USART1)

+    u->BRR = STM32_USART1CLK / config->sc_speed;

+  else

+    u->BRR = STM32_PCLK / config->sc_speed;

+

+  /*

+   * Note that some bits are enforced.

+   */

+  u->CR1 = config->sc_cr1 | USART_CR1_UE | USART_CR1_PEIE |

+                            USART_CR1_RXNEIE | USART_CR1_TE |

+                            USART_CR1_RE;

+  u->CR2 = config->sc_cr2 | USART_CR2_LBDIE;

+  u->CR3 = config->sc_cr3 | USART_CR3_EIE;

+  u->ICR = 0xFFFFFFFF;

+}

+

+/**

+ * @brief   USART de-initialization.

+ * @details This function must be invoked with interrupts disabled.

+ *

+ * @param[in] u         pointer to an USART I/O block

+ */

+static void usart_deinit(USART_TypeDef *u) {

+

+  u->CR1 = 0;

+  u->CR2 = 0;

+  u->CR3 = 0;

+}

+

+/**

+ * @brief   Error handling routine.

+ *

+ * @param[in] sdp       pointer to a @p SerialDriver object

+ * @param[in] isr       USART ISR register value

+ */

+static void set_error(SerialDriver *sdp, uint16_t isr) {

+  chnflags_t sts = 0;

+

+  if (isr & USART_ISR_ORE)

+    sts |= SD_OVERRUN_ERROR;

+  if (isr & USART_ISR_PE)

+    sts |= SD_PARITY_ERROR;

+  if (isr & USART_ISR_FE)

+    sts |= SD_FRAMING_ERROR;

+  if (isr & USART_ISR_NE)

+    sts |= SD_NOISE_ERROR;

+  chSysLockFromIsr();

+  chnAddFlagsI(sdp, sts);

+  chSysUnlockFromIsr();

+}

+

+/**

+ * @brief   Common IRQ handler.

+ *

+ * @param[in] sdp       communication channel associated to the USART

+ */

+static void serve_interrupt(SerialDriver *sdp) {

+  USART_TypeDef *u = sdp->usart;

+  uint16_t cr1 = u->CR1;

+  uint16_t isr;

+

+  /* Reading and clearing status.*/

+  isr = u->ISR;

+  u->ICR = isr;

+

+  /* Error condition detection.*/

+  if (isr & (USART_ISR_ORE | USART_ISR_NE | USART_ISR_FE  | USART_ISR_PE))

+    set_error(sdp, isr);

+  /* Special case, LIN break detection.*/

+  if (isr & USART_ISR_LBD) {

+    chSysLockFromIsr();

+    chnAddFlagsI(sdp, SD_BREAK_DETECTED);

+    chSysUnlockFromIsr();

+  }

+  /* Data available.*/

+  if (isr & USART_ISR_RXNE) {

+    chSysLockFromIsr();

+    sdIncomingDataI(sdp, (uint8_t)u->RDR);

+    chSysUnlockFromIsr();

+  }

+  /* Transmission buffer empty.*/

+  if ((cr1 & USART_CR1_TXEIE) && (isr & USART_ISR_TXE)) {

+    msg_t b;

+    chSysLockFromIsr();

+    b = chOQGetI(&sdp->oqueue);

+    if (b < Q_OK) {

+      chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

+      u->CR1 = (cr1 & ~USART_CR1_TXEIE) | USART_CR1_TCIE;

+    }

+    else

+      u->TDR = b;

+    chSysUnlockFromIsr();

+  }

+  /* Physical transmission end.*/

+  if (isr & USART_ISR_TC) {

+    chSysLockFromIsr();

+    chnAddFlagsI(sdp, CHN_TRANSMISSION_END);

+    chSysUnlockFromIsr();

+    u->CR1 = cr1 & ~USART_CR1_TCIE;

+  }

+}

+

+#else /* !defined(STM32F0XX) */

+

 /**

  * @brief   USART initialization.

  * @details This function must be invoked with interrupts disabled.

@@ -130,9 +253,6 @@ static void usart_deinit(USART_TypeDef *u) {
   u->CR3 = 0;

 }

 

-#if STM32_SERIAL_USE_USART1 || STM32_SERIAL_USE_USART2 ||                   \

-    STM32_SERIAL_USE_USART3 || STM32_SERIAL_USE_UART4  ||                   \

-    STM32_SERIAL_USE_UART5  || STM32_SERIAL_USE_USART6

 /**

  * @brief   Error handling routine.

  *

@@ -204,7 +324,8 @@ static void serve_interrupt(SerialDriver *sdp) {
     u->SR &= ~USART_SR_TC;

   }

 }

-#endif

+

+#endif /* !defined(STM32F0XX) */

 

 #if STM32_SERIAL_USE_USART1 || defined(__DOXYGEN__)

 static void notify1(GenericQueue *qp) {