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

1 files changed, 41 insertions, 29 deletions

diff --git a/testhal/STM32F1xx/I2C/mcuconf.h b/testhal/STM32F1xx/I2C/mcuconf.h
index d449b1d0e..030bd10ba 100644
--- a/testhal/STM32F1xx/I2C/mcuconf.h
+++ b/testhal/STM32F1xx/I2C/mcuconf.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -18,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

@@ -57,15 +58,14 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_ADC1_DMA_PRIORITY         3

+#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_ADC1_IRQ_PRIORITY         5

-#define STM32_ADC_ADC1_DMA_ERROR_HOOK()     chSysHalt()

 

 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  FALSE

+#define STM32_CAN_USE_CAN1                  TRUE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

@@ -86,8 +86,8 @@
 /*

  * GPT driver system settings.

  */

-#define STM32_GPT_USE_TIM1                  TRUE

-#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM1                  FALSE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  FALSE

 #define STM32_GPT_USE_TIM4                  FALSE

 #define STM32_GPT_USE_TIM5                  FALSE

@@ -97,6 +97,23 @@
 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

 #define STM32_GPT_TIM4_IRQ_PRIORITY         7

 #define STM32_GPT_TIM5_IRQ_PRIORITY         7

+#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.

@@ -104,7 +121,7 @@
 #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

@@ -112,6 +129,7 @@
 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

 #define STM32_ICU_TIM4_IRQ_PRIORITY         7

 #define STM32_ICU_TIM5_IRQ_PRIORITY         7

+#define STM32_ICU_TIM8_IRQ_PRIORITY         7

 

 /*

  * PWM driver system settings.

@@ -119,15 +137,21 @@
 #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_TIM4                  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

-#define STM32_PWM_TIM1_IRQ_PRIORITY         2

-#define STM32_PWM_TIM2_IRQ_PRIORITY         2

-#define STM32_PWM_TIM3_IRQ_PRIORITY         2

-#define STM32_PWM_TIM4_IRQ_PRIORITY         2

-#define STM32_PWM_TIM5_IRQ_PRIORITY         2

+#define STM32_PWM_TIM1_IRQ_PRIORITY         7

+#define STM32_PWM_TIM2_IRQ_PRIORITY         7

+#define STM32_PWM_TIM3_IRQ_PRIORITY         7

+#define STM32_PWM_TIM4_IRQ_PRIORITY         7

+#define STM32_PWM_TIM5_IRQ_PRIORITY         7

+#define STM32_PWM_TIM8_IRQ_PRIORITY         7

+

+/*

+ * RTC driver system settings.

+ */

+#define STM32_RTC_IRQ_PRIORITY              15

 

 /*

  * SERIAL driver system settings.

@@ -174,21 +198,9 @@
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

 

 /*

- * I2C driver system settings.

- */

-#define STM32_I2C_USE_I2C1                  TRUE

-#define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

-#define STM32_I2C_I2C1_DMA_PRIORITY         1

-#define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-

-/*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  FALSE

+#define STM32_USB_USE_USB1                  TRUE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      6

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14