Aligned mcuconf.h files for STM32F0xx devices. Removed obsolete settings, added DMA remapping settings.

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

8 files changed, 132 insertions, 42 deletions

diff --git a/testhal/STM32/STM32F0xx/ADC/mcuconf.h b/testhal/STM32/STM32F0xx/ADC/mcuconf.h
index 18339018d..57cc0e77f 100644
--- a/testhal/STM32/STM32F0xx/ADC/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/ADC/mcuconf.h
@@ -41,6 +41,7 @@
 #define STM32_PLS                           STM32_PLS_LEV0

 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_HSI14_ENABLED                 TRUE

+#define STM32_HSI48_ENABLED                 FALSE

 #define STM32_LSI_ENABLED                   TRUE

 #define STM32_HSE_ENABLED                   FALSE

 #define STM32_LSE_ENABLED                   FALSE

@@ -50,11 +51,8 @@
 #define STM32_PLLMUL_VALUE                  12

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE                          STM32_PPRE_DIV1

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

+#define STM32_USBSW                         STM32_USBSW_HSI48

 #define STM32_CECSW                         STM32_CECSW_HSI

 #define STM32_I2C1SW                        STM32_I2C1SW_HSI

 #define STM32_USART1SW                      STM32_USART1SW_PCLK

@@ -64,9 +62,10 @@
  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_ADC1_CKMODE               STM32_ADC_CKMODE_ADCCLK

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_IRQ_PRIORITY              2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2

+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

  * EXT driver system settings.

@@ -101,6 +100,10 @@
 #define STM32_I2C_USE_DMA                   TRUE

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

@@ -141,6 +144,10 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

@@ -158,6 +165,10 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 #endif /* _MCUCONF_H_ */

diff --git a/testhal/STM32/STM32F0xx/CAN/mcuconf.h b/testhal/STM32/STM32F0xx/CAN/mcuconf.h
index 8c812e3fe..0b5e9f9c5 100644
--- a/testhal/STM32/STM32F0xx/CAN/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/CAN/mcuconf.h
@@ -51,11 +51,7 @@
 #define STM32_PLLMUL_VALUE                  12

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE                          STM32_PPRE_DIV1

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

 #define STM32_USBSW                         STM32_USBSW_HSI48

 #define STM32_CECSW                         STM32_CECSW_HSI

 #define STM32_I2C1SW                        STM32_I2C1SW_HSI

@@ -66,9 +62,10 @@
  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

+#define STM32_ADC_ADC1_CKMODE               STM32_ADC_CKMODE_ADCCLK

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_IRQ_PRIORITY              2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2

+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

  * CAN driver system settings.

@@ -109,6 +106,10 @@
 #define STM32_I2C_USE_DMA                   TRUE

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

@@ -135,7 +136,7 @@
 /*

  * SERIAL driver system settings.

  */

-#define STM32_SERIAL_USE_USART1             TRUE

+#define STM32_SERIAL_USE_USART1             FALSE

 #define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USART1_PRIORITY        3

 #define STM32_SERIAL_USART2_PRIORITY        3

@@ -149,6 +150,10 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

@@ -166,6 +171,10 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

diff --git a/testhal/STM32/STM32F0xx/EXT/mcuconf.h b/testhal/STM32/STM32F0xx/EXT/mcuconf.h
index 2a8901048..3afbfc88f 100644
--- a/testhal/STM32/STM32F0xx/EXT/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/EXT/mcuconf.h
@@ -41,6 +41,7 @@
 #define STM32_PLS                           STM32_PLS_LEV0

 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_HSI14_ENABLED                 TRUE

+#define STM32_HSI48_ENABLED                 FALSE

 #define STM32_LSI_ENABLED                   TRUE

 #define STM32_HSE_ENABLED                   FALSE

 #define STM32_LSE_ENABLED                   FALSE

@@ -50,11 +51,8 @@
 #define STM32_PLLMUL_VALUE                  12

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE                          STM32_PPRE_DIV1

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

+#define STM32_USBSW                         STM32_USBSW_HSI48

 #define STM32_CECSW                         STM32_CECSW_HSI

 #define STM32_I2C1SW                        STM32_I2C1SW_HSI

 #define STM32_USART1SW                      STM32_USART1SW_PCLK

@@ -64,9 +62,10 @@
  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

+#define STM32_ADC_ADC1_CKMODE               STM32_ADC_CKMODE_ADCCLK

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_IRQ_PRIORITY              2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2

+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

  * EXT driver system settings.

@@ -101,6 +100,10 @@
 #define STM32_I2C_USE_DMA                   TRUE

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

@@ -141,6 +144,10 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

@@ -158,6 +165,10 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 #endif /* _MCUCONF_H_ */

diff --git a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
index b5fbc69f4..559a6ec12 100644
--- a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
@@ -41,6 +41,7 @@
 #define STM32_PLS                           STM32_PLS_LEV0

 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_HSI14_ENABLED                 TRUE

+#define STM32_HSI48_ENABLED                 FALSE

 #define STM32_LSI_ENABLED                   TRUE

 #define STM32_HSE_ENABLED                   FALSE

 #define STM32_LSE_ENABLED                   FALSE

@@ -50,11 +51,8 @@
 #define STM32_PLLMUL_VALUE                  12

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE                          STM32_PPRE_DIV1

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

+#define STM32_USBSW                         STM32_USBSW_HSI48

 #define STM32_CECSW                         STM32_CECSW_HSI

 #define STM32_I2C1SW                        STM32_I2C1SW_HSI

 #define STM32_USART1SW                      STM32_USART1SW_PCLK

@@ -64,9 +62,10 @@
  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

+#define STM32_ADC_ADC1_CKMODE               STM32_ADC_CKMODE_ADCCLK

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_IRQ_PRIORITY              2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2

+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

  * EXT driver system settings.

@@ -101,6 +100,10 @@
 #define STM32_I2C_USE_DMA                   TRUE

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

@@ -141,6 +144,10 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

@@ -158,6 +165,10 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 #endif /* _MCUCONF_H_ */

diff --git a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
index 92e871a53..26c39712e 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
@@ -41,6 +41,7 @@
 #define STM32_PLS                           STM32_PLS_LEV0

 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_HSI14_ENABLED                 TRUE

+#define STM32_HSI48_ENABLED                 FALSE

 #define STM32_LSI_ENABLED                   TRUE

 #define STM32_HSE_ENABLED                   FALSE

 #define STM32_LSE_ENABLED                   FALSE

@@ -50,11 +51,8 @@
 #define STM32_PLLMUL_VALUE                  12

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE                          STM32_PPRE_DIV1

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

+#define STM32_USBSW                         STM32_USBSW_HSI48

 #define STM32_CECSW                         STM32_CECSW_HSI

 #define STM32_I2C1SW                        STM32_I2C1SW_HSI

 #define STM32_USART1SW                      STM32_USART1SW_PCLK

@@ -64,9 +62,10 @@
  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

+#define STM32_ADC_ADC1_CKMODE               STM32_ADC_CKMODE_ADCCLK

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_IRQ_PRIORITY              2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2

+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

  * EXT driver system settings.

@@ -101,6 +100,10 @@
 #define STM32_I2C_USE_DMA                   TRUE

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

@@ -141,6 +144,10 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

@@ -158,6 +165,10 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 #endif /* _MCUCONF_H_ */

diff --git a/testhal/STM32/STM32F0xx/SPI/mcuconf.h b/testhal/STM32/STM32F0xx/SPI/mcuconf.h
index ac30427b4..8fa797035 100644
--- a/testhal/STM32/STM32F0xx/SPI/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/SPI/mcuconf.h
@@ -41,6 +41,7 @@
 #define STM32_PLS                           STM32_PLS_LEV0

 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_HSI14_ENABLED                 TRUE

+#define STM32_HSI48_ENABLED                 FALSE

 #define STM32_LSI_ENABLED                   TRUE

 #define STM32_HSE_ENABLED                   FALSE

 #define STM32_LSE_ENABLED                   FALSE

@@ -50,11 +51,8 @@
 #define STM32_PLLMUL_VALUE                  12

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE                          STM32_PPRE_DIV1

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

+#define STM32_USBSW                         STM32_USBSW_HSI48

 #define STM32_CECSW                         STM32_CECSW_HSI

 #define STM32_I2C1SW                        STM32_I2C1SW_HSI

 #define STM32_USART1SW                      STM32_USART1SW_PCLK

@@ -64,9 +62,10 @@
  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

+#define STM32_ADC_ADC1_CKMODE               STM32_ADC_CKMODE_ADCCLK

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_IRQ_PRIORITY              2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2

+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

  * EXT driver system settings.

@@ -101,6 +100,10 @@
 #define STM32_I2C_USE_DMA                   TRUE

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

@@ -141,6 +144,10 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

@@ -158,6 +165,10 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 #endif /* _MCUCONF_H_ */

diff --git a/testhal/STM32/STM32F0xx/UART/mcuconf.h b/testhal/STM32/STM32F0xx/UART/mcuconf.h
index 760abd643..f8e6250d2 100644
--- a/testhal/STM32/STM32F0xx/UART/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/UART/mcuconf.h
@@ -41,6 +41,7 @@
 #define STM32_PLS                           STM32_PLS_LEV0

 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_HSI14_ENABLED                 TRUE

+#define STM32_HSI48_ENABLED                 FALSE

 #define STM32_LSI_ENABLED                   TRUE

 #define STM32_HSE_ENABLED                   FALSE

 #define STM32_LSE_ENABLED                   FALSE

@@ -50,11 +51,8 @@
 #define STM32_PLLMUL_VALUE                  12

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE                          STM32_PPRE_DIV1

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

+#define STM32_USBSW                         STM32_USBSW_HSI48

 #define STM32_CECSW                         STM32_CECSW_HSI

 #define STM32_I2C1SW                        STM32_I2C1SW_HSI

 #define STM32_USART1SW                      STM32_USART1SW_PCLK

@@ -64,9 +62,10 @@
  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

+#define STM32_ADC_ADC1_CKMODE               STM32_ADC_CKMODE_ADCCLK

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_IRQ_PRIORITY              2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2

+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

  * EXT driver system settings.

@@ -101,6 +100,10 @@
 #define STM32_I2C_USE_DMA                   TRUE

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

@@ -141,6 +144,10 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

@@ -158,6 +165,10 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 #endif /* _MCUCONF_H_ */

diff --git a/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h b/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h
index 0fa6fb9e4..35e91dd27 100644
--- a/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h
@@ -51,11 +51,7 @@
 #define STM32_PLLMUL_VALUE                  12

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE                          STM32_PPRE_DIV1

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_ADCSW                         STM32_ADCSW_HSI14

 #define STM32_USBSW                         STM32_USBSW_HSI48

 #define STM32_CECSW                         STM32_CECSW_HSI

 #define STM32_I2C1SW                        STM32_I2C1SW_HSI

@@ -65,10 +61,17 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_USE_ADC1                  FALSE

+#define STM32_ADC_ADC1_CKMODE               STM32_ADC_CKMODE_ADCCLK

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_IRQ_PRIORITY              2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2

+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

+

+/*

+ * CAN driver system settings.

+ */

+#define STM32_CAN_USE_CAN1                  FALSE

+#define STM32_CAN_CAN1_IRQ_PRIORITY         3

 

 /*

  * EXT driver system settings.

@@ -103,6 +106,10 @@
 #define STM32_I2C_USE_DMA                   TRUE

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

@@ -143,6 +150,10 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

@@ -160,6 +171,10 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)

+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 2)

+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)

+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 4)

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*