SPIv1 and SPIv2 circular mode added. Rework of RCC files and all dependencies inside STM32 drivers. Documentation fixes in some HAL modules.

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

1 files changed, 37 insertions, 121 deletions

diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_rcc.h b/os/hal/ports/STM32/STM32F0xx/stm32_rcc.h
index d25d5735b..d99cf606e 100644
--- a/os/hal/ports/STM32/STM32F0xx/stm32_rcc.h
+++ b/os/hal/ports/STM32/STM32F0xx/stm32_rcc.h
@@ -24,8 +24,8 @@
  * @{

  */

 

-#ifndef _STM32_RCC_

-#define _STM32_RCC_

+#ifndef STM32_RCC_H

+#define STM32_RCC_H

 

 /*===========================================================================*/

 /* Driver constants.                                                         */

@@ -66,14 +66,12 @@
 

 /**

  * @brief   Disables the clock of one or more peripheral on the APB1 bus.

- * @note    The @p lp parameter is ignored in this family.

  *

  * @param[in] mask      APB1 peripherals mask

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableAPB1(mask, lp) {                                          \

+#define rccDisableAPB1(mask) {                                              \

   RCC->APB1ENR &= ~(mask);                                                  \

 }

 

@@ -104,14 +102,12 @@
 

 /**

  * @brief   Disables the clock of one or more peripheral on the APB2 bus.

- * @note    The @p lp parameter is ignored in this family.

  *

  * @param[in] mask      APB2 peripherals mask

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableAPB2(mask, lp) {                                          \

+#define rccDisableAPB2(mask) {                                              \

   RCC->APB2ENR &= ~(mask);                                                  \

 }

 

@@ -142,14 +138,12 @@
 

 /**

  * @brief   Disables the clock of one or more peripheral on the AHB bus.

- * @note    The @p lp parameter is ignored in this family.

  *

  * @param[in] mask      AHB peripherals mask

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableAHB(mask, lp) {                                           \

+#define rccDisableAHB(mask) {                                               \

   RCC->AHBENR &= ~(mask);                                                   \

 }

 

@@ -182,13 +176,10 @@
 

 /**

  * @brief   Disables the ADC1 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableADC1(lp) rccDisableAPB2(RCC_APB2ENR_ADC1EN, lp)

+#define rccDisableADC1() rccDisableAPB2(RCC_APB2ENR_ADC1EN)

 

 /**

  * @brief   Resets the ADC1 peripheral.

@@ -214,13 +205,10 @@
 

 /**

  * @brief   Disables the CAN1 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableCAN1(lp) rccDisableAPB1(RCC_APB1ENR_CANEN, lp)

+#define rccDisableCAN1() rccDisableAPB1(RCC_APB1ENR_CANEN)

 

 /**

  * @brief   Resets the CAN1 peripheral.

@@ -236,6 +224,7 @@
  */

 /**

  * @brief   Enables the DAC1 peripheral clock.

+ * @note    The @p lp parameter is ignored in this family.

  *

  * @param[in] lp        low power enable flag

  *

@@ -246,11 +235,9 @@
 /**

  * @brief   Disables the DAC1 peripheral clock.

  *

- * @param[in] lp        low power enable flag

- *

  * @api

  */

-#define rccDisableDAC1(lp) rccDisableAPB1(RCC_APB1ENR_DACEN, lp)

+#define rccDisableDAC1() rccDisableAPB1(RCC_APB1ENR_DACEN)

 

 /**

  * @brief   Resets the DAC1 peripheral.

@@ -276,13 +263,10 @@
 

 /**

  * @brief   Disables PWR interface clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisablePWRInterface(lp) rccDisableAPB1(RCC_APB1ENR_PWREN, lp)

+#define rccDisablePWRInterface() rccDisableAPB1(RCC_APB1ENR_PWREN)

 

 /**

  * @brief   Resets the PWR interface.

@@ -308,13 +292,10 @@
 

 /**

  * @brief   Disables the DMA1 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableDMA1(lp) rccDisableAHB(RCC_AHBENR_DMA1EN, lp)

+#define rccDisableDMA1() rccDisableAHB(RCC_AHBENR_DMA1EN)

 

 /**

  * @brief   Resets the DMA1 peripheral.

@@ -336,13 +317,10 @@
 

 /**

  * @brief   Disables the DMA2 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableDMA2(lp) rccDisableAHB(RCC_AHBENR_DMA2EN, lp)

+#define rccDisableDMA2() rccDisableAHB(RCC_AHBENR_DMA2EN)

 

 /**

  * @brief   Resets the DMA2 peripheral.

@@ -369,13 +347,10 @@
 

 /**

  * @brief   Disables the I2C1 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableI2C1(lp) rccDisableAPB1(RCC_APB1ENR_I2C1EN, lp)

+#define rccDisableI2C1() rccDisableAPB1(RCC_APB1ENR_I2C1EN)

 

 /**

  * @brief   Resets the I2C1 peripheral.

@@ -396,13 +371,10 @@
 

 /**

  * @brief   Disables the I2C2 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableI2C2(lp) rccDisableAPB1(RCC_APB1ENR_I2C2EN, lp)

+#define rccDisableI2C2() rccDisableAPB1(RCC_APB1ENR_I2C2EN)

 

 /**

  * @brief   Resets the I2C2 peripheral.

@@ -428,13 +400,10 @@
 

 /**

  * @brief   Disables the SPI1 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableSPI1(lp) rccDisableAPB2(RCC_APB2ENR_SPI1EN, lp)

+#define rccDisableSPI1() rccDisableAPB2(RCC_APB2ENR_SPI1EN)

 

 /**

  * @brief   Resets the SPI1 peripheral.

@@ -455,13 +424,10 @@
 

 /**

  * @brief   Disables the SPI2 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableSPI2(lp) rccDisableAPB1(RCC_APB1ENR_SPI2EN, lp)

+#define rccDisableSPI2() rccDisableAPB1(RCC_APB1ENR_SPI2EN)

 

 /**

  * @brief   Resets the SPI2 peripheral.

@@ -487,13 +453,10 @@
 

 /**

  * @brief   Disables the TIM1 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM1(lp) rccDisableAPB2(RCC_APB2ENR_TIM1EN, lp)

+#define rccDisableTIM1() rccDisableAPB2(RCC_APB2ENR_TIM1EN)

 

 /**

  * @brief   Resets the TIM1 peripheral.

@@ -514,13 +477,10 @@
 

 /**

  * @brief   Disables the TIM2 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM2(lp) rccDisableAPB1(RCC_APB1ENR_TIM2EN, lp)

+#define rccDisableTIM2() rccDisableAPB1(RCC_APB1ENR_TIM2EN)

 

 /**

  * @brief   Resets the TIM2 peripheral.

@@ -541,13 +501,10 @@
 

 /**

  * @brief   Disables the TIM3 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM3(lp) rccDisableAPB1(RCC_APB1ENR_TIM3EN, lp)

+#define rccDisableTIM3() rccDisableAPB1(RCC_APB1ENR_TIM3EN)

 

 /**

  * @brief   Resets the TIM3 peripheral.

@@ -568,13 +525,10 @@
 

 /**

  * @brief   Disables the TIM6 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM6(lp) rccDisableAPB1(RCC_APB1ENR_TIM6EN, lp)

+#define rccDisableTIM6() rccDisableAPB1(RCC_APB1ENR_TIM6EN)

 

 /**

  * @brief   Resets the TIM6 peripheral.

@@ -595,13 +549,10 @@
 

 /**

  * @brief   Disables the TIM7 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM7(lp) rccDisableAPB1(RCC_APB1ENR_TIM7EN, lp)

+#define rccDisableTIM7() rccDisableAPB1(RCC_APB1ENR_TIM7EN)

 

 /**

  * @brief   Resets the TIM7 peripheral.

@@ -622,13 +573,10 @@
 

 /**

  * @brief   Disables the TIM14 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM14(lp) rccDisableAPB1(RCC_APB1ENR_TIM14EN, lp)

+#define rccDisableTIM14() rccDisableAPB1(RCC_APB1ENR_TIM14EN)

 

 /**

  * @brief   Resets the TIM14 peripheral.

@@ -649,13 +597,10 @@
 

 /**

  * @brief   Disables the TIM15 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM15(lp) rccDisableAPB2(RCC_APB2ENR_TIM15EN, lp)

+#define rccDisableTIM15() rccDisableAPB2(RCC_APB2ENR_TIM15EN)

 

 /**

  * @brief   Resets the TIM15 peripheral.

@@ -676,13 +621,10 @@
 

 /**

  * @brief   Disables the TIM16 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM16(lp) rccDisableAPB2(RCC_APB2ENR_TIM16EN, lp)

+#define rccDisableTIM16() rccDisableAPB2(RCC_APB2ENR_TIM16EN)

 

 /**

  * @brief   Resets the TIM16 peripheral.

@@ -703,13 +645,10 @@
 

 /**

  * @brief   Disables the TIM17 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableTIM17(lp) rccDisableAPB2(RCC_APB2ENR_TIM17EN, lp)

+#define rccDisableTIM17() rccDisableAPB2(RCC_APB2ENR_TIM17EN)

 

 /**

  * @brief   Resets the TIM17 peripheral.

@@ -735,13 +674,10 @@
 

 /**

  * @brief   Disables the USART1 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableUSART1(lp) rccDisableAPB2(RCC_APB2ENR_USART1EN, lp)

+#define rccDisableUSART1() rccDisableAPB2(RCC_APB2ENR_USART1EN)

 

 /**

  * @brief   Resets the USART1 peripheral.

@@ -762,13 +698,10 @@
 

 /**

  * @brief   Disables the USART2 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableUSART2(lp) rccDisableAPB1(RCC_APB1ENR_USART2EN, lp)

+#define rccDisableUSART2() rccDisableAPB1(RCC_APB1ENR_USART2EN)

 

 /**

  * @brief   Resets the USART2 peripheral.

@@ -789,13 +722,10 @@
 

 /**

  * @brief   Disables the USART3 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableUSART3(lp) rccDisableAPB1(RCC_APB1ENR_USART3EN, lp)

+#define rccDisableUSART3() rccDisableAPB1(RCC_APB1ENR_USART3EN)

 

 /**

  * @brief   Resets the USART3 peripheral.

@@ -816,13 +746,10 @@
 

 /**

  * @brief   Disables the USART4 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableUART4(lp) rccDisableAPB1(RCC_APB1ENR_USART4EN, lp)

+#define rccDisableUART4() rccDisableAPB1(RCC_APB1ENR_USART4EN)

 

 /**

  * @brief   Resets the USART4 peripheral.

@@ -843,13 +770,10 @@
 

 /**

  * @brief   Disables the USART5 peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableUART5(lp) rccDisableAPB1(RCC_APB1ENR_USART5EN, lp)

+#define rccDisableUART5() rccDisableAPB1(RCC_APB1ENR_USART5EN)

 

 /**

  * @brief   Resets the USART5 peripheral.

@@ -860,6 +784,7 @@
 

 /**

  * @brief   Enables the USART6 peripheral clock.

+ * @note    The @p lp parameter is ignored in this family.

  *

  * @param[in] lp        low power enable flag

  *

@@ -870,11 +795,9 @@
 /**

  * @brief   Disables the USART6 peripheral clock.

  *

- * @param[in] lp        low power enable flag

- *

  * @api

  */

-#define rccDisableUSART6(lp) rccDisableAPB2(RCC_APB2ENR_USART6EN, lp)

+#define rccDisableUSART6() rccDisableAPB2(RCC_APB2ENR_USART6EN)

 

 /**

  * @brief   Resets the USART6 peripheral.

@@ -890,6 +813,7 @@
  */

 /**

  * @brief   Enables the USB peripheral clock.

+ * @note    The @p lp parameter is ignored in this family.

  *

  * @param[in] lp        low power enable flag

  *

@@ -900,11 +824,9 @@
 /**

  * @brief   Disables the USB peripheral clock.

  *

- * @param[in] lp        low power enable flag

- *

  * @api

  */

-#define rccDisableUSB(lp) rccDisableAPB1(RCC_APB1ENR_USBEN, lp)

+#define rccDisableUSB() rccDisableAPB1(RCC_APB1ENR_USBEN)

 

 /**

  * @brief   Resets the USB peripheral.

@@ -930,13 +852,10 @@
 

 /**

  * @brief   Disables the CRC peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableCRC(lp) rccDisableAHB(RCC_AHBENR_CRCEN, lp)

+#define rccDisableCRC() rccDisableAHB(RCC_AHBENR_CRCEN)

 

 /**

  * @brief   Resets the CRC peripheral.

@@ -962,13 +881,10 @@
 

 /**

  * @brief   Disables the WWDG peripheral clock.

- * @note    The @p lp parameter is ignored in this family.

- *

- * @param[in] lp        low power enable flag

  *

  * @api

  */

-#define rccDisableWWDG(lp) rccDisableAPB1(RCC_APB1ENR_WWDGEN, lp)

+#define rccDisableWWDG() rccDisableAPB1(RCC_APB1ENR_WWDGEN)

 

 /**

  * @brief   Resets the WWDG peripheral.

@@ -989,6 +905,6 @@ extern "C" {
 }

 #endif

 

-#endif /* _STM32_RCC_ */

+#endif /* STM32_RCC_H */

 

 /** @} */