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

1 files changed, 41 insertions, 63 deletions

diff --git a/os/hal/platforms/STM32/spi_lld.h b/os/hal/platforms/STM32/spi_lld.h
index 4b44a2750..b93497e41 100644
--- a/os/hal/platforms/STM32/spi_lld.h
+++ b/os/hal/platforms/STM32/spi_lld.h
@@ -39,105 +39,105 @@
 /*===========================================================================*/

 

 /**

- * @brief SPI1 driver enable switch.

+ * @brief   SPI1 driver enable switch.

  * @details If set to @p TRUE the support for SPI1 is included.

- * @note The default is @p TRUE.

+ * @note    The default is @p TRUE.

  */

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

 #define USE_STM32_SPI1              TRUE

 #endif

 

 /**

- * @brief SPI2 driver enable switch.

+ * @brief   SPI2 driver enable switch.

  * @details If set to @p TRUE the support for SPI2 is included.

- * @note The default is @p TRUE.

+ * @note    The default is @p TRUE.

  */

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

 #define USE_STM32_SPI2              TRUE

 #endif

 

 /**

- * @brief SPI3 driver enable switch.

+ * @brief   SPI3 driver enable switch.

  * @details If set to @p TRUE the support for SPI3 is included.

- * @note The default is @p TRUE.

+ * @note    The default is @p TRUE.

  */

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

 #define USE_STM32_SPI3              FALSE

 #endif

 

 /**

- * @brief SPI1 DMA priority (0..3|lowest..highest).

- * @note The priority level is used for both the TX and RX DMA channels but

- *       because of the channels ordering the RX channel has always priority

- *       over the TX channel.

+ * @brief   SPI1 DMA priority (0..3|lowest..highest).

+ * @note    The priority level is used for both the TX and RX DMA channels but

+ *          because of the channels ordering the RX channel has always priority

+ *          over the TX channel.

  */

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

 #define STM32_SPI1_DMA_PRIORITY     2

 #endif

 

 /**

- * @brief SPI2 DMA priority (0..3|lowest..highest).

- * @note The priority level is used for both the TX and RX DMA channels but

- *       because of the channels ordering the RX channel has always priority

- *       over the TX channel.

+ * @brief   SPI2 DMA priority (0..3|lowest..highest).

+ * @note    The priority level is used for both the TX and RX DMA channels but

+ *          because of the channels ordering the RX channel has always priority

+ *          over the TX channel.

  */

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

 #define STM32_SPI2_DMA_PRIORITY     2

 #endif

 

 /**

- * @brief SPI3 DMA priority (0..3|lowest..highest).

- * @note The priority level is used for both the TX and RX DMA channels but

- *       because of the channels ordering the RX channel has always priority

- *       over the TX channel.

+ * @brief   SPI3 DMA priority (0..3|lowest..highest).

+ * @note    The priority level is used for both the TX and RX DMA channels but

+ *          because of the channels ordering the RX channel has always priority

+ *          over the TX channel.

  */

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

 #define STM32_SPI3_DMA_PRIORITY     2

 #endif

 

 /**

- * @brief SPI1 interrupt priority level setting.

+ * @brief   SPI1 interrupt priority level setting.

  */

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

 #define STM32_SPI1_IRQ_PRIORITY     10

 #endif

 

 /**

- * @brief SPI2 interrupt priority level setting.

+ * @brief   SPI2 interrupt priority level setting.

  */

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

 #define STM32_SPI2_IRQ_PRIORITY     10

 #endif

 

 /**

- * @brief SPI3 interrupt priority level setting.

+ * @brief   SPI3 interrupt priority level setting.

  */

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

 #define STM32_SPI3_IRQ_PRIORITY     10

 #endif

 

 /**

- * @brief SPI1 DMA error hook.

- * @note The default action for DMA errors is a system halt because DMA error

- *       can only happen because programming errors.

+ * @brief   SPI1 DMA error hook.

+ * @note    The default action for DMA errors is a system halt because DMA error

+ *          can only happen because programming errors.

  */

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

 #define STM32_SPI1_DMA_ERROR_HOOK() chSysHalt()

 #endif

 

 /**

- * @brief SPI2 DMA error hook.

- * @note The default action for DMA errors is a system halt because DMA error

- *       can only happen because programming errors.

+ * @brief   SPI2 DMA error hook.

+ * @note    The default action for DMA errors is a system halt because DMA error

+ *          can only happen because programming errors.

  */

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

 #define STM32_SPI2_DMA_ERROR_HOOK() chSysHalt()

 #endif

 

 /**

- * @brief SPI3 DMA error hook.

- * @note The default action for DMA errors is a system halt because DMA error

- *       can only happen because programming errors.

+ * @brief   SPI3 DMA error hook.

+ * @note    The default action for DMA errors is a system halt because DMA error

+ *          can only happen because programming errors.

  */

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

 #define STM32_SPI3_DMA_ERROR_HOOK() chSysHalt()

@@ -155,17 +155,11 @@
  * @brief Driver configuration structure.

  */

 typedef struct {

-  /**

-   * @brief The chip select line port.

-   */

+  /** @brief The chip select line port.*/

   ioportid_t            spc_ssport;

-  /**

-   * @brief The chip select line pad number.

-   */

+  /** @brief The chip select line pad number.*/

   uint16_t              spc_sspad;

-  /**

-   * @brief SPI initialization data.

-   */

+  /** @brief SPI initialization data.*/

   uint16_t              spc_cr1;

 } SPIConfig;

 

@@ -173,44 +167,28 @@ typedef struct {
  * @brief Structure representing a SPI driver.

  */

 typedef struct {

-  /**

-   * @brief Driver state.

-   */

+  /** @brief Driver state.*/

   spistate_t            spd_state;

 #if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)

 #if CH_USE_MUTEXES || defined(__DOXYGEN__)

-  /**

-   * @brief Mutex protecting the bus.

-   */

+  /** @brief Mutex protecting the bus.*/

   Mutex                 spd_mutex;

 #elif CH_USE_SEMAPHORES

   Semaphore             spd_semaphore;

 #endif

 #endif /* SPI_USE_MUTUAL_EXCLUSION */

-  /**

-   * @brief Current configuration data.

-   */

+  /** @brief Current configuration data.*/

   const SPIConfig       *spd_config;

   /* End of the mandatory fields.*/

-  /**

-   * @brief Thread waiting for I/O completion.

-   */

+  /** @brief Thread waiting for I/O completion.*/

   Thread                *spd_thread;

-  /**

-   * @brief Pointer to the SPIx registers block.

-   */

+  /** @brief Pointer to the SPIx registers block.*/

   SPI_TypeDef           *spd_spi;

-  /**

-   * @brief Pointer to the receive DMA channel registers block.

-   */

+  /** @brief Pointer to the receive DMA channel registers block.*/

   DMA_Channel_TypeDef   *spd_dmarx;

-  /**

-   * @brief Pointer to the transmit DMA channel registers block.

-   */

+  /** @brief Pointer to the transmit DMA channel registers block.*/

   DMA_Channel_TypeDef   *spd_dmatx;

-  /**

-   * @brief DMA priority bit mask.

-   */

+  /** @brief DMA priority bit mask.*/

   uint32_t              spd_dmaprio;

 } SPIDriver;