Added USB clock configuration to the STM32 HAL driver.

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

11 files changed, 33 insertions, 2 deletions

diff --git a/demos/ARMCM3-STM32F100-DISCOVERY-GCC/mcuconf.h b/demos/ARMCM3-STM32F100-DISCOVERY-GCC/mcuconf.h
index 017a37fde..19e54d797 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY-GCC/mcuconf.h
+++ b/demos/ARMCM3-STM32F100-DISCOVERY-GCC/mcuconf.h
@@ -42,6 +42,7 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV1

 #define STM32_PPRE2                         STM32_PPRE2_DIV1

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV2

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCO                           STM32_MCO_NOCLOCK

 

 /*

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h b/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h
index 251197a66..4e640b93f 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h
@@ -42,6 +42,7 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCO                           STM32_MCO_NOCLOCK

 

 /*

diff --git a/demos/ARMCM3-STM32F103-GCC/mcuconf.h b/demos/ARMCM3-STM32F103-GCC/mcuconf.h
index 251197a66..4e640b93f 100644
--- a/demos/ARMCM3-STM32F103-GCC/mcuconf.h
+++ b/demos/ARMCM3-STM32F103-GCC/mcuconf.h
@@ -42,6 +42,7 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCO                           STM32_MCO_NOCLOCK

 

 /*

diff --git a/os/hal/platforms/STM32/hal_lld.c b/os/hal/platforms/STM32/hal_lld.c
index faa265f59..b83262722 100644
--- a/os/hal/platforms/STM32/hal_lld.c
+++ b/os/hal/platforms/STM32/hal_lld.c
@@ -113,8 +113,9 @@ void stm32_clock_init(void) {
 #endif

 

   /* Clock settings.*/

-  RCC->CFGR = STM32_MCO | STM32_PLLMUL | STM32_PLLXTPRE | STM32_PLLSRC |

-              STM32_ADCPRE | STM32_PPRE2 | STM32_PPRE1 | STM32_HPRE;

+  RCC->CFGR = STM32_MCO | STM32_USBPRE | STM32_PLLMUL | STM32_PLLXTPRE |

+              STM32_PLLSRC | STM32_ADCPRE | STM32_PPRE2 | STM32_PPRE1 |

+              STM32_HPRE;

 

   /* Flash setup and final clock selection.   */

   FLASH->ACR = STM32_FLASHBITS; /* Flash wait states depending on clock.    */

diff --git a/os/hal/platforms/STM32/hal_lld_f103.h b/os/hal/platforms/STM32/hal_lld_f103.h
index 8e5b25053..5adec93dc 100644
--- a/os/hal/platforms/STM32/hal_lld_f103.h
+++ b/os/hal/platforms/STM32/hal_lld_f103.h
@@ -80,6 +80,9 @@
 #define STM32_PLLXTPRE_DIV1     (0 << 17)   /**< HSE divided by 1.          */

 #define STM32_PLLXTPRE_DIV2     (1 << 17)   /**< HSE divided by 2.          */

 

+#define STM32_USBPRE_DIV1P5     (0 << 22)   /**< PLLOUT divided by 1.5.     */

+#define STM32_USBPRE_DIV1       (1 << 22)   /**< PLLOUT divided by 1.       */

+

 #define STM32_MCO_NOCLOCK       (0 << 24)   /**< No clock on MCO pin.       */

 #define STM32_MCO_SYSCLK        (4 << 24)   /**< SYSCLK on MCO pin.         */

 #define STM32_MCO_HSI           (5 << 24)   /**< HSI clock on MCO pin.      */

@@ -244,6 +247,13 @@
 #endif

 

 /**

+ * @brief   USB prescaler initialization.

+ */

+#if !defined(STM32_USEUSB) || defined(__DOXYGEN__)

+#define STM32_USBPRE                STM32_USBPRE_DIV1P5

+#endif

+

+/**

  * @brief   MCO pin setting.

  */

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

@@ -406,6 +416,17 @@
 #error "invalid STM32_ADCPRE value specified"

 #endif

 

+/**

+ * @brief   USB frequency.

+ */

+#if (STM32_USBPRE == STM32_USBPRE_DIV1P5) || defined(__DOXYGEN__)

+#define STM32_USBCLK                ((STM32_PLLCLKOUT * 2) / 3)

+#elif (STM32_USBPRE == STM32_USBPRE_DIV1)

+#define STM32_USBCLK                STM32_PLLCLKOUT

+#else

+#error "invalid STM32_USBPRE value specified"

+#endif

+

 /* ADC frequency check.*/

 #if STM32_ADCCLK > 14000000

 #error "STM32_ADCCLK exceeding maximum frequency (14MHz)"

diff --git a/readme.txt b/readme.txt
index 6eaf6b97f..8a2a22b6f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -69,6 +69,7 @@
   included in 2.2.0, requires more testing).

 - NEW: Integrated the STM32 GCC, IAR and RVCT demos in a single demo with

   multiple project files, the code is exactly the same.

+- NEW: Added an USB clock configuration in the STM32 HAL driver (LD, MD, HD).

 - CHANGE: Modified the ADC and CAN drivers to allow a NULL pointer for

   the configuration structure if it is not required by the implementation.

 - CHANGE: Modified the MMC_SPI driver to *require* a NULL as pointer to

diff --git a/testhal/STM32/ADC/mcuconf.h b/testhal/STM32/ADC/mcuconf.h
index 251197a66..4e640b93f 100644
--- a/testhal/STM32/ADC/mcuconf.h
+++ b/testhal/STM32/ADC/mcuconf.h
@@ -42,6 +42,7 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCO                           STM32_MCO_NOCLOCK

 

 /*

diff --git a/testhal/STM32/CAN/mcuconf.h b/testhal/STM32/CAN/mcuconf.h
index 251197a66..4e640b93f 100644
--- a/testhal/STM32/CAN/mcuconf.h
+++ b/testhal/STM32/CAN/mcuconf.h
@@ -42,6 +42,7 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCO                           STM32_MCO_NOCLOCK

 

 /*

diff --git a/testhal/STM32/PWM/mcuconf.h b/testhal/STM32/PWM/mcuconf.h
index 251197a66..4e640b93f 100644
--- a/testhal/STM32/PWM/mcuconf.h
+++ b/testhal/STM32/PWM/mcuconf.h
@@ -42,6 +42,7 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCO                           STM32_MCO_NOCLOCK

 

 /*

diff --git a/testhal/STM32/SPI/mcuconf.h b/testhal/STM32/SPI/mcuconf.h
index d2a0bb17b..302ab55dd 100644
--- a/testhal/STM32/SPI/mcuconf.h
+++ b/testhal/STM32/SPI/mcuconf.h
@@ -42,6 +42,7 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCO                           STM32_MCO_NOCLOCK

 

 /*

diff --git a/testhal/STM32/UART/mcuconf.h b/testhal/STM32/UART/mcuconf.h
index 251197a66..4e640b93f 100644
--- a/testhal/STM32/UART/mcuconf.h
+++ b/testhal/STM32/UART/mcuconf.h
@@ -42,6 +42,7 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCO                           STM32_MCO_NOCLOCK

 

 /*