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

2 files changed, 28 insertions, 18 deletions

diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/halconf.h b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/halconf.h
index cdf73d129..1dd5a80c0 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/halconf.h
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/halconf.h
@@ -34,7 +34,7 @@
  * @brief   Enables the TM subsystem.

  */

 #if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  TRUE

+#define HAL_USE_TM                  FALSE

 #endif

 

 /**

@@ -139,7 +139,7 @@
  * @brief   Enables the SDC subsystem.

  */

 #if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 TRUE

+#define HAL_USE_SDC                 FALSE

 #endif

 

 /**

@@ -153,7 +153,7 @@
  * @brief   Enables the SERIAL over USB subsystem.

  */

 #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          TRUE

+#define HAL_USE_SERIAL_USB          FALSE

 #endif

 

 /**

@@ -174,7 +174,7 @@
  * @brief   Enables the USB subsystem.

  */

 #if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 TRUE

+#define HAL_USE_USB                 FALSE

 #endif

 

 /**

diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/mcuconf.h b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/mcuconf.h
index 89682daba..bb4614397 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/mcuconf.h
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/mcuconf.h
@@ -17,10 +17,8 @@
 #ifndef MCUCONF_H

 #define MCUCONF_H

 

-#define STM32F103_MCUCONF

-

 /*

- * STM32F103 drivers configuration.

+ * STM32F107 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

@@ -33,6 +31,8 @@
  * 0...3        Lowest...Highest.

  */

 

+#define STM32F107_MCUCONF

+

 /*

  * HAL driver system settings.

  */

@@ -42,16 +42,21 @@
 #define STM32_HSE_ENABLED                   TRUE

 #define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

-#define STM32_PLLSRC                        STM32_PLLSRC_HSE

-#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

+#define STM32_PLLSRC                        STM32_PLLSRC_PREDIV1

+#define STM32_PREDIV1SRC                    STM32_PREDIV1SRC_PLL2

+#define STM32_PREDIV1_VALUE                 5

 #define STM32_PLLMUL_VALUE                  9

+#define STM32_PREDIV2_VALUE                 5

+#define STM32_PLL2MUL_VALUE                 8

+#define STM32_PLL3MUL_VALUE                 10

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_USB_CLOCK_REQUIRED            TRUE

-#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_OTG_CLOCK_REQUIRED            TRUE

+#define STM32_OTGFSPRE                      STM32_OTGFSPRE_DIV3

+#define STM32_I2S_CLOCK_REQUIRED            FALSE

+#define STM32_MCOSEL                        STM32_MCOSEL_PLL3

 #define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

@@ -67,7 +72,9 @@
  * CAN driver system settings.

  */

 #define STM32_CAN_USE_CAN1                  FALSE

+#define STM32_CAN_USE_CAN2                  FALSE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

+#define STM32_CAN_CAN2_IRQ_PRIORITY         11

 

 /*

  * EXT driver system settings.

@@ -110,7 +117,8 @@
 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

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

+#define STM32_I2C_I2C1_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")

+#define STM32_I2C_I2C2_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -155,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_USART1_PRIORITY        12

@@ -201,10 +209,12 @@
 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

-#define STM32_USB_USB1_HP_IRQ_PRIORITY      13

-#define STM32_USB_USB1_LP_IRQ_PRIORITY      14

+#define STM32_USB_USE_OTG1                  FALSE

+#define STM32_USB_OTG1_IRQ_PRIORITY         14

+#define STM32_USB_OTG1_RX_FIFO_SIZE         512

+#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

+#define STM32_USB_OTG_THREAD_STACK_SIZE     128

+#define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

  * WDG driver system settings.