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

6 files changed, 115 insertions, 38 deletions

diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/mcuconf.h b/demos/ARMCM3-STM32F100-DISCOVERY/mcuconf.h
index aea5c25c2..9e0ba2cab 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY/mcuconf.h
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/mcuconf.h
@@ -19,7 +19,7 @@
 */

 

 /*

- * STM32 drivers configuration.

+ * STM32F100 drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -98,12 +98,28 @@
 #define STM32_GPT_TIM8_IRQ_PRIORITY         7

 

 /*

+ * I2C driver system settings.

+ */

+#define STM32_I2C_USE_I2C1                  FALSE

+#define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_I2C1_IRQ_PRIORITY         10

+#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C3_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_DMA_PRIORITY         1

+#define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C3_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+

+/*

  * ICU driver system settings.

  */

 #define STM32_ICU_USE_TIM1                  FALSE

 #define STM32_ICU_USE_TIM2                  FALSE

 #define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  TRUE

+#define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

@@ -119,7 +135,7 @@
 #define STM32_PWM_USE_ADVANCED              FALSE

 #define STM32_PWM_USE_TIM1                  FALSE

 #define STM32_PWM_USE_TIM2                  FALSE

-#define STM32_PWM_USE_TIM3                  TRUE

+#define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

@@ -131,10 +147,15 @@
 #define STM32_PWM_TIM8_IRQ_PRIORITY         7

 

 /*

+ * RTC driver system settings.

+ */

+#define STM32_RTC_IRQ_PRIORITY              15

+

+/*

  * SERIAL driver system settings.

  */

-#define STM32_SERIAL_USE_USART1             TRUE

-#define STM32_SERIAL_USE_USART2             FALSE

+#define STM32_SERIAL_USE_USART1             FALSE

+#define STM32_SERIAL_USE_USART2             TRUE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -149,8 +170,8 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

 #define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

@@ -164,7 +185,7 @@
  * UART driver system settings.

  */

 #define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               TRUE

+#define STM32_UART_USE_USART2               FALSE

 #define STM32_UART_USE_USART3               FALSE

 #define STM32_UART_USART1_IRQ_PRIORITY      12

 #define STM32_UART_USART2_IRQ_PRIORITY      12

diff --git a/demos/ARMCM3-STM32F103-FATFS/mcuconf.h b/demos/ARMCM3-STM32F103-FATFS/mcuconf.h
index c94d3a2a5..8c550e657 100644
--- a/demos/ARMCM3-STM32F103-FATFS/mcuconf.h
+++ b/demos/ARMCM3-STM32F103-FATFS/mcuconf.h
@@ -19,7 +19,7 @@
 */

 

 /*

- * STM32 drivers configuration.

+ * STM32F1xx drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -100,12 +100,28 @@
 #define STM32_GPT_TIM8_IRQ_PRIORITY         7

 

 /*

+ * I2C driver system settings.

+ */

+#define STM32_I2C_USE_I2C1                  FALSE

+#define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_I2C1_IRQ_PRIORITY         10

+#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C3_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_DMA_PRIORITY         1

+#define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C3_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+

+/*

  * ICU driver system settings.

  */

 #define STM32_ICU_USE_TIM1                  FALSE

 #define STM32_ICU_USE_TIM2                  FALSE

 #define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  TRUE

+#define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

@@ -118,8 +134,8 @@
 /*

  * PWM driver system settings.

  */

-#define STM32_PWM_USE_ADVANCED              TRUE

-#define STM32_PWM_USE_TIM1                  TRUE

+#define STM32_PWM_USE_ADVANCED              FALSE

+#define STM32_PWM_USE_TIM1                  FALSE

 #define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

@@ -133,6 +149,11 @@
 #define STM32_PWM_TIM8_IRQ_PRIORITY         7

 

 /*

+ * RTC driver system settings.

+ */

+#define STM32_RTC_IRQ_PRIORITY              15

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -151,7 +172,7 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

 #define STM32_SPI_USE_SPI2                  TRUE

 #define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

@@ -166,7 +187,7 @@
  * UART driver system settings.

  */

 #define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               TRUE

+#define STM32_UART_USE_USART2               FALSE

 #define STM32_UART_USE_USART3               FALSE

 #define STM32_UART_USART1_IRQ_PRIORITY      12

 #define STM32_UART_USART2_IRQ_PRIORITY      12

diff --git a/demos/ARMCM3-STM32F103-G++/mcuconf.h b/demos/ARMCM3-STM32F103-G++/mcuconf.h
index c94d3a2a5..bdabb958a 100644
--- a/demos/ARMCM3-STM32F103-G++/mcuconf.h
+++ b/demos/ARMCM3-STM32F103-G++/mcuconf.h
@@ -19,7 +19,7 @@
 */

 

 /*

- * STM32 drivers configuration.

+ * STM32F1xx drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -100,12 +100,28 @@
 #define STM32_GPT_TIM8_IRQ_PRIORITY         7

 

 /*

+ * I2C driver system settings.

+ */

+#define STM32_I2C_USE_I2C1                  FALSE

+#define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_I2C1_IRQ_PRIORITY         10

+#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C3_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_DMA_PRIORITY         1

+#define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C3_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+

+/*

  * ICU driver system settings.

  */

 #define STM32_ICU_USE_TIM1                  FALSE

 #define STM32_ICU_USE_TIM2                  FALSE

 #define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  TRUE

+#define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

@@ -118,8 +134,8 @@
 /*

  * PWM driver system settings.

  */

-#define STM32_PWM_USE_ADVANCED              TRUE

-#define STM32_PWM_USE_TIM1                  TRUE

+#define STM32_PWM_USE_ADVANCED              FALSE

+#define STM32_PWM_USE_TIM1                  FALSE

 #define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

@@ -133,6 +149,11 @@
 #define STM32_PWM_TIM8_IRQ_PRIORITY         7

 

 /*

+ * RTC driver system settings.

+ */

+#define STM32_RTC_IRQ_PRIORITY              15

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -151,8 +172,8 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

 #define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

@@ -166,7 +187,7 @@
  * UART driver system settings.

  */

 #define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               TRUE

+#define STM32_UART_USE_USART2               FALSE

 #define STM32_UART_USE_USART3               FALSE

 #define STM32_UART_USART1_IRQ_PRIORITY      12

 #define STM32_UART_USART2_IRQ_PRIORITY      12

diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h b/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
index 89333b942..88a74e7e0 100644
--- a/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
@@ -19,7 +19,7 @@
 */

 

 /*

- * STM32 drivers configuration.

+ * STM32F1xx drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -100,12 +100,28 @@
 #define STM32_GPT_TIM8_IRQ_PRIORITY         7

 

 /*

+ * I2C driver system settings.

+ */

+#define STM32_I2C_USE_I2C1                  FALSE

+#define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_I2C1_IRQ_PRIORITY         10

+#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C3_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_DMA_PRIORITY         1

+#define STM32_I2C_I2C2_DMA_PRIORITY         1

+#define STM32_I2C_I2C3_DMA_PRIORITY         1

+#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+

+/*

  * ICU driver system settings.

  */

 #define STM32_ICU_USE_TIM1                  FALSE

 #define STM32_ICU_USE_TIM2                  FALSE

 #define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  TRUE

+#define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

@@ -118,8 +134,8 @@
 /*

  * PWM driver system settings.

  */

-#define STM32_PWM_USE_ADVANCED              TRUE

-#define STM32_PWM_USE_TIM1                  TRUE

+#define STM32_PWM_USE_ADVANCED              FALSE

+#define STM32_PWM_USE_TIM1                  FALSE

 #define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

@@ -133,11 +149,9 @@
 #define STM32_PWM_TIM8_IRQ_PRIORITY         7

 

 /*

- * SDC driver system settings.

+ * RTC driver system settings.

  */

-#define STM32_SDC_DATATIMEOUT               0x000FFFFF

-#define STM32_SDC_SDIO_DMA_PRIORITY         3

-#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_RTC_IRQ_PRIORITY              15

 

 /*

  * SERIAL driver system settings.

@@ -158,8 +172,8 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

 #define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

@@ -173,7 +187,7 @@
  * UART driver system settings.

  */

 #define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               TRUE

+#define STM32_UART_USE_USART2               FALSE

 #define STM32_UART_USE_USART3               FALSE

 #define STM32_UART_USART1_IRQ_PRIORITY      12

 #define STM32_UART_USART2_IRQ_PRIORITY      12

diff --git a/demos/ARMCM3-STM32F107/main.c b/demos/ARMCM3-STM32F107/main.c
index 570d6b2e3..4436116a6 100644
--- a/demos/ARMCM3-STM32F107/main.c
+++ b/demos/ARMCM3-STM32F107/main.c
@@ -54,7 +54,7 @@ int main(void) {
   chSysInit();

 

   /*

-   * Activates the serial driver 2 using the driver default configuration.

+   * Activates the serial driver 3 using the driver default configuration.

    */

   sdStart(&SD3, NULL);

 

diff --git a/demos/ARMCM3-STM32F107/mcuconf.h b/demos/ARMCM3-STM32F107/mcuconf.h
index e001164a3..13fbde6e9 100644
--- a/demos/ARMCM3-STM32F107/mcuconf.h
+++ b/demos/ARMCM3-STM32F107/mcuconf.h
@@ -19,7 +19,7 @@
 */

 

 /*

- * STM32 drivers configuration.

+ * STM32F1xx drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -110,9 +110,9 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

-#define STM32_I2C_I2C1_IRQ_PRIORITY         6

-#define STM32_I2C_I2C2_IRQ_PRIORITY         6

-#define STM32_I2C_I2C3_IRQ_PRIORITY         6

+#define STM32_I2C_I2C1_IRQ_PRIORITY         10

+#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C3_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_I2C3_DMA_PRIORITY         1

@@ -163,7 +163,7 @@
  */

 #define STM32_SERIAL_USE_USART1             FALSE

 #define STM32_SERIAL_USE_USART2             FALSE

-#define STM32_SERIAL_USE_USART3             FALSE

+#define STM32_SERIAL_USE_USART3             TRUE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

 #define STM32_SERIAL_USE_USART6             FALSE