andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More SPI v2 code. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14916 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-10-17 10:30:42 +00:00
parent e5098d67e4
commit f83396ec38
3 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/include/hal.h
View File

@ -111,7 +111,7 @@
#define HAL_RET_HW_BUSY (msg_t)-18
/**
* @brief Peripheral failure.
* @details Peripheral failed during initialization, for example HW timeouts.
* @details Peripheral failed, for example HW timeouts.
*/
#define HAL_RET_HW_FAILURE (msg_t)-19
/** @} */

58
os/hal/include/hal_spi_v2.h
View File

@ -44,6 +44,14 @@
#define SPI_SELECT_MODE_LLD 4 /** @brief LLD-defined mode.*/
/** @} */
/**
* @name SPI-specific messages
* @{
*/
#define MSG_SPI_BUFFER_FULL MSG_OK
#define MSG_SPI_BUFFER_HALF (msg_t)-3
/** @} */
/*===========================================================================*/
/* Driver pre-compile time settings. */
/*===========================================================================*/
@ -365,7 +373,7 @@ do { \
*
* @notapi
*/
#define __spi_wakeup_isr(spip) { \
#define __spi_wakeup_isr(spip, msg) { \
osalSysLockFromISR(); \
osalThreadResumeI(&(spip)->sync_transfer, MSG_OK); \
osalSysUnlockFromISR(); \
@ -374,32 +382,6 @@ do { \
#define __spi_wakeup_isr(spip)
#endif /* !SPI_USE_SYNCHRONIZATION */
/**
* @brief Common ISR code when circular mode is not supported.
* @details This code handles the portable part of the ISR code:
* - Callback invocation.
* - Waiting thread wakeup, if any.
* - Driver state transitions.
* .
* @note This macro is meant to be used in the low level drivers
* implementation only.
*
* @param[in] spip pointer to the @p SPIDriver object
*
* @notapi
*/
#define __spi_isr_code(spip) { \
if ((spip)->config->end_cb) { \
(spip)->state = SPI_COMPLETE; \
(spip)->config->end_cb(spip); \
if ((spip)->state == SPI_COMPLETE) \
(spip)->state = SPI_READY; \
} \
else \
(spip)->state = SPI_READY; \
__spi_wakeup_isr(spip); \
}
/**
* @brief Half buffer filled ISR code in circular mode.
* @details This code handles the portable part of the ISR code:
@ -416,6 +398,7 @@ do { \
if ((spip)->config->end_cb) { \
(spip)->config->end_cb(spip); \
} \
__spi_wakeup_isr(spip, MSG_SPI_BUFFER_HALF); \
}
/**
@ -435,9 +418,28 @@ do { \
if ((spip)->config->end_cb) { \
(spip)->state = SPI_COMPLETE; \
(spip)->config->end_cb(spip); \
if ((spip)->state == SPI_COMPLETE) \
if ((spip)->state == SPI_COMPLETE) { \
(spip)->state = SPI_ACTIVE; \
} \
} \
__spi_wakeup_isr(spip, MSG_SPI_BUFFER_FULL); \
}
/**
* @brief ISR error reporting code..
* @note This macro is meant to be used in the low level drivers
* implementation only.
*
* @param[in] spip pointer to the @p SPIDriver object
* @param[in] msg error code
*
* @notapi
*/
#define __spi_isr_error_code(spip, msg) { \
if ((spip)->config->error_cb) { \
(spip)->config->error_cb(spip); \
} \
__spi_wakeup_isr(spip, msg); \
}
/** @} */

44
os/hal/ports/STM32/LLD/SPIv2/hal_spi_v2_lld.c
View File

@ -132,15 +132,19 @@ static uint16_t dummyrx;
static void spi_lld_serve_rx_interrupt(SPIDriver *spip, uint32_t flags) {
/* DMA errors handling.*/
#if defined(STM32_SPI_DMA_ERROR_HOOK)
if ((flags & (STM32_DMA_ISR_TEIF | STM32_DMA_ISR_DMEIF)) != 0) {
#if defined(STM32_SPI_DMA_ERROR_HOOK)
/* Hook first, if defined.*/
STM32_SPI_DMA_ERROR_HOOK(spip);
}
#else
(void)flags;
#endif
if (spip->config->circular) {
/* Aborting the transfer, best effort.*/
(void) spi_lld_stop_transfer(spip, NULL);
/* Reporting the failure.*/
__spi_isr_error_code(spip, HAL_RET_HW_FAILURE);
}
else if (spip->config->circular) {
if ((flags & STM32_DMA_ISR_HTIF) != 0U) {
/* Half buffer interrupt.*/
__spi_isr_half_code(spip);
@ -151,13 +155,9 @@ static void spi_lld_serve_rx_interrupt(SPIDriver *spip, uint32_t flags) {
}
}
else {
/* Stopping DMAs.*/
dmaStreamDisable(spip->dmatx);
dmaStreamDisable(spip->dmarx);
/* Portable SPI ISR code defined in the high level driver, note, it is
a macro.*/
__spi_isr_code(spip);
__spi_isr_full_code(spip);
}
}
@ -170,17 +170,29 @@ static void spi_lld_serve_rx_interrupt(SPIDriver *spip, uint32_t flags) {
static void spi_lld_serve_tx_interrupt(SPIDriver *spip, uint32_t flags) {
/* DMA errors handling.*/
#if defined(STM32_SPI_DMA_ERROR_HOOK)
(void)spip;
if ((flags & (STM32_DMA_ISR_TEIF | STM32_DMA_ISR_DMEIF)) != 0) {
#if defined(STM32_SPI_DMA_ERROR_HOOK)
/* Hook first, if defined.*/
STM32_SPI_DMA_ERROR_HOOK(spip);
}
#else
(void)spip;
(void)flags;
#endif
/* Aborting the transfer, best effort.*/
(void) spi_lld_stop_transfer(spip, NULL);
/* Reporting the failure.*/
__spi_isr_error_code(spip, HAL_RET_HW_FAILURE);
}
}
/**
* @brief DMA streams allocation.
*
* @param[in] spip pointer to the @p SPIDriver object
* @param[in] rxstream stream to be allocated for RX
* @param[in] txstream stream to be allocated for TX
* @param[in] priority streams IRQ priority
* @return The operation status.
*/
static msg_t spi_lld_get_dma(SPIDriver *spip, uint32_t rxstream,
uint32_t txstream, uint32_t priority){