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

This commit is contained in:
Giovanni Di Sirio 2017-12-28 08:40:21 +00:00
parent 541fc3bcfa
commit f4b0c6a818
8 changed files with 42 additions and 37 deletions

View File

@ -96,24 +96,42 @@ typedef struct {
/** /**
* @brief Operation complete callback or @p NULL. * @brief Operation complete callback or @p NULL.
*/ */
spicallback_t end_cb; spicallback_t end_cb;
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_LINE) || defined(__DOXYGEN__)
/**
* @brief The chip select line.
*/
ioline_t ssline;
#endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__)
/**
* @brief The chip select port.
*/
ioportid_t ssport;
/**
* @brief The chip select port mask.
*/
ioportmask_t ssmask;
#endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__)
/**
* @brief The chip select port.
*/
ioportid_t ssport;
/**
* @brief The chip select pad number.
*/
uint_fast8_t sspad;
#endif
/* End of the mandatory fields.*/ /* End of the mandatory fields.*/
/**
* @brief The chip select line port.
*/
ioportid_t ssport;
/**
* @brief The chip select line pad number.
*/
uint16_t sspad;
/** /**
* @brief SSP CR0 initialization data. * @brief SSP CR0 initialization data.
*/ */
uint16_t cr0; uint16_t cr0;
/** /**
* @brief SSP CPSR initialization data. * @brief SSP CPSR initialization data.
*/ */
uint32_t cpsr; uint32_t cpsr;
} SPIConfig; } SPIConfig;
/** /**

View File

@ -1,20 +1,14 @@
STM32 DMAv2 driver. STM32 DMAv3 driver.
Driver capability: Driver capability:
- The driver supports the STM32 enhanced DMA controller found on F2, F4 and - The driver supports the STM32 enhanced DMA controller found on H7 sub-family.
F7 sub-families.
- Support for automatic the channel selection.
- Support for cache flushing and invalidation. - Support for cache flushing and invalidation.
The file registry must export: The file registry must export:
STM32_ADVANCED_DMA - TRUE not used by the DMA drivers but other
drivers use it to enable checks on DMA
channels. Probably will be removed in the
future.
STM32_HAS_DMAx - Support for DMA unit "x" (1..2). STM32_HAS_DMAx - Support for DMA unit "x" (1..2).
STM32_DMAx_CHn_HANDLER - Vector name for channel "n" (0..7). STM32_DMAx_CHn_HANDLER - Vector name for channel "n" (0..7).
STM32_DMAn_CHx_NUMBER - Vector number for channel "n" (0..7). STM32_DMAx_CHn_NUMBER - Vector number for channel "n" (0..7).
STM32_DMA_CACHE_HANDLING - TRUE if the device requires explicit cache STM32_DMA_CACHE_HANDLING - TRUE if the device requires explicit cache
handling on DMA buffers. handling on DMA buffers.

View File

@ -15,7 +15,7 @@
*/ */
/** /**
* @file DMAv2/stm32_dma.c * @file DMAv3/stm32_dma.c
* @brief Enhanced DMA helper driver code. * @brief Enhanced DMA helper driver code.
* *
* @addtogroup STM32_DMA * @addtogroup STM32_DMA

View File

@ -15,7 +15,7 @@
*/ */
/** /**
* @file DMAv2/stm32_dma.h * @file DMAv3/stm32_dma.h
* @brief Enhanced-DMA helper driver header. * @brief Enhanced-DMA helper driver header.
* *
* @addtogroup STM32_DMA * @addtogroup STM32_DMA
@ -29,13 +29,6 @@
/* Driver constants. */ /* Driver constants. */
/*===========================================================================*/ /*===========================================================================*/
/**
* @brief DMA capability.
* @details if @p TRUE then the DMA is able of burst transfers, FIFOs,
* scatter gather and other advanced features.
*/
#define STM32_DMA_ADVANCED TRUE
/** /**
* @brief Total number of DMA streams. * @brief Total number of DMA streams.
* @details This is the total number of streams among all the DMA units. * @details This is the total number of streams among all the DMA units.

View File

@ -429,7 +429,7 @@ typedef struct {
/** /**
* @brief The chip select line. * @brief The chip select line.
*/ */
ioportid_t ssline; ioline_t ssline;
#endif #endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__) #if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__)
/** /**
@ -439,7 +439,7 @@ typedef struct {
/** /**
* @brief The chip select port mask. * @brief The chip select port mask.
*/ */
uint8fast_t ssmask; ioportmask_t ssmask;
#endif #endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__) #if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__)
/** /**

View File

@ -429,7 +429,7 @@ typedef struct {
/** /**
* @brief The chip select line. * @brief The chip select line.
*/ */
ioportid_t ssline; ioline_t ssline;
#endif #endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__) #if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__)
/** /**
@ -439,7 +439,7 @@ typedef struct {
/** /**
* @brief The chip select port mask. * @brief The chip select port mask.
*/ */
uint8fast_t ssmask; ioportmask_t ssmask;
#endif #endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__) #if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__)
/** /**

View File

@ -333,7 +333,7 @@ typedef struct {
/** /**
* @brief The chip select line. * @brief The chip select line.
*/ */
ioportid_t ssline; ioline_t ssline;
#endif #endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__) #if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__)
/** /**
@ -343,7 +343,7 @@ typedef struct {
/** /**
* @brief The chip select port mask. * @brief The chip select port mask.
*/ */
uint8fast_t ssmask; ioportmask_t ssmask;
#endif #endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__) #if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__)
/** /**

View File

@ -84,7 +84,7 @@ typedef struct {
/** /**
* @brief The chip select line. * @brief The chip select line.
*/ */
ioportid_t ssline; ioline_t ssline;
#endif #endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__) #if (SPI_SELECT_MODE == SPI_SELECT_MODE_PORT) || defined(__DOXYGEN__)
/** /**
@ -94,7 +94,7 @@ typedef struct {
/** /**
* @brief The chip select port mask. * @brief The chip select port mask.
*/ */
uint8fast_t ssmask; ioportmask_t ssmask;
#endif #endif
#if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__) #if (SPI_SELECT_MODE == SPI_SELECT_MODE_PAD) || defined(__DOXYGEN__)
/** /**