I2C ported but needs to be reviewed to not use virtual timers directly.

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

1 files changed, 22 insertions, 55 deletions

diff --git a/os/hal/platforms/STM32/USARTv2/uart_lld.h b/os/hal/platforms/STM32/USARTv2/uart_lld.h
index c34123aca..6b4393e96 100644
--- a/os/hal/platforms/STM32/USARTv2/uart_lld.h
+++ b/os/hal/platforms/STM32/USARTv2/uart_lld.h
@@ -126,58 +126,6 @@
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 #endif

 

-#if STM32_ADVANCED_DMA || defined(__DOXYGEN__)

-

-/**

- * @brief   DMA stream used for USART1 RX operations.

- * @note    This option is only available on platforms with enhanced DMA.

- */

-#if !defined(STM32_UART_USART1_RX_DMA_STREAM) || defined(__DOXYGEN__)

-#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 5)

-#endif

-

-/**

- * @brief   DMA stream used for USART1 TX operations.

- * @note    This option is only available on platforms with enhanced DMA.

- */

-#if !defined(STM32_UART_USART1_TX_DMA_STREAM) || defined(__DOXYGEN__)

-#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)

-#endif

-

-/**

- * @brief   DMA stream used for USART2 RX operations.

- * @note    This option is only available on platforms with enhanced DMA.

- */

-#if !defined(STM32_UART_USART2_RX_DMA_STREAM) || defined(__DOXYGEN__)

-#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

-#endif

-

-/**

- * @brief   DMA stream used for USART2 TX operations.

- * @note    This option is only available on platforms with enhanced DMA.

- */

-#if !defined(STM32_UART_USART2_TX_DMA_STREAM) || defined(__DOXYGEN__)

-#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 6)

-#endif

-

-/**

- * @brief   DMA stream used for USART3 RX operations.

- * @note    This option is only available on platforms with enhanced DMA.

- */

-#if !defined(STM32_UART_USART3_RX_DMA_STREAM) || defined(__DOXYGEN__)

-#define STM32_UART_USART3_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 1)

-#endif

-

-/**

- * @brief   DMA stream used for USART3 TX operations.

- * @note    This option is only available on platforms with enhanced DMA.

- */

-#if !defined(STM32_UART_USART3_TX_DMA_STREAM) || defined(__DOXYGEN__)

-#define STM32_UART_USART3_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

-#endif

-

-#else /* !STM32_ADVANCED_DMA*/

-

 #if defined(STM32F0XX)

 /* Fixed values for STM32F0xx devices.*/

 #define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

@@ -186,7 +134,7 @@
 #define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #endif /* defined(STM32F0XX) */

 

-#if defined(STM32F30X)|| defined(STM32F37X)

+#if defined(STM32F37X)

 /* Fixed values for STM32F3xx devices.*/

 #define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

 #define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

@@ -195,8 +143,6 @@
 #define STM32_UART_USART3_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

 #define STM32_UART_USART3_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

 #endif /* defined(STM32F30X) */

-

-#endif /* !STM32_ADVANCED_DMA*/

 /** @} */

 

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

@@ -250,6 +196,26 @@
 #error "Invalid DMA priority assigned to USART3"

 #endif

 

+/* The following checks are only required when there is a DMA able to

+   reassign streams to different channels.*/

+#if STM32_ADVANCED_DMA

+/* Check on the presence of the DMA streams settings in mcuconf.h.*/

+#if STM32_UART_USE_USART1 && (!defined(STM32_UART_USART1_RX_DMA_STREAM) ||  \

+                              !defined(STM32_UART_USART1_TX_DMA_STREAM))

+#error "USART1 DMA streams not defined"

+#endif

+

+#if STM32_UART_USE_USART2 && (!defined(STM32_UART_USART2_RX_DMA_STREAM) ||  \

+                              !defined(STM32_UART_USART2_TX_DMA_STREAM))

+#error "USART2 DMA streams not defined"

+#endif

+

+#if STM32_UART_USE_USART3 && (!defined(STM32_UART_USART3_RX_DMA_STREAM) ||  \

+                              !defined(STM32_UART_USART3_TX_DMA_STREAM))

+#error "USART3 DMA streams not defined"

+#endif

+

+/* Check on the validity of the assigned DMA channels.*/

 #if STM32_UART_USE_USART1 &&                                                \

     !STM32_DMA_IS_VALID_ID(STM32_UART_USART1_RX_DMA_STREAM,                 \

                            STM32_USART1_RX_DMA_MSK)

@@ -285,6 +251,7 @@
                            STM32_USART3_TX_DMA_MSK)

 #error "invalid DMA stream associated to USART3 TX"

 #endif

+#endif /* STM32_ADVANCED_DMA */

 

 #if !defined(STM32_DMA_REQUIRED)

 #define STM32_DMA_REQUIRED