From 99cee8a6ed66b380c8d29fa82413dcc659b6068a Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 25 Dec 2010 11:30:44 +0000
Subject: 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
---
 os/hal/platforms/STM32/hal_lld.c      |  5 +++--
 os/hal/platforms/STM32/hal_lld_f103.h | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'os/hal')

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.      */
@@ -243,6 +246,13 @@
 #define STM32_ADCPRE                STM32_ADCPRE_DIV4
 #endif
 
+/**
+ * @brief   USB prescaler initialization.
+ */
+#if !defined(STM32_USEUSB) || defined(__DOXYGEN__)
+#define STM32_USBPRE                STM32_USBPRE_DIV1P5
+#endif
+
 /**
  * @brief   MCO pin setting.
  */
@@ -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)"
-- 
cgit v1.2.3