I2C. Merge code to trunk.

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

1 files changed, 9 insertions, 16 deletions

diff --git a/testhal/STM32F1xx/I2C/mcuconf.h b/testhal/STM32F1xx/I2C/mcuconf.h
index 6afc97f28..dc4d3960c 100644
--- a/testhal/STM32F1xx/I2C/mcuconf.h
+++ b/testhal/STM32F1xx/I2C/mcuconf.h
@@ -47,7 +47,7 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_USE_ADC1                  FALSE

 #define STM32_ADC_ADC1_DMA_PRIORITY         3

 #define STM32_ADC_ADC1_IRQ_PRIORITY         5

 #define STM32_ADC_ADC1_DMA_ERROR_HOOK()     chSysHalt()

@@ -122,8 +122,8 @@
 /*

  * SERIAL driver system settings.

  */

-#define STM32_SERIAL_USE_USART1             TRUE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART1             FALSE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -138,8 +138,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

@@ -167,25 +167,18 @@
  * I2C driver system settings.

  */

 #define STM32_I2C_USE_I2C1                  TRUE

-#define STM32_I2C_USE_I2C2                  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         4

-#define STM32_I2C_I2C2_DMA_PRIORITY         4

+#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()

-/* I2C1 */

-#define STM32_I2C_I2C1_USE_GPT_TIM          GPTD1

-#define STM32_I2C_I2C1_USE_POLLING_WAIT     TRUE

-/* I2C2 */

-#define STM32_I2C_I2C2_USE_GPT_TIM          GPTD2

-#define STM32_I2C_I2C2_USE_POLLING_WAIT     TRUE

-

 

 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      6

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14