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

Merge pull request #332 from WestberryTech/chibios-21.11.x-wb 

[WB32 MCU] adjusts some DMA and ADC processing.
This commit is contained in:
Fabien Poussin 2022-09-03 13:19:53 +02:00 committed by GitHub
parent d03aa9cc2f 8cd207b805
commit 3872fe996c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os/hal/ports/WB32/LLD/ADCv1/hal_adc_lld.c
View File

@ -58,19 +58,19 @@ ADCDriver ADCD1;
static void adc_lld_serve_rx_interrupt(ADCDriver *adcp, uint32_t flags) {
/* DMA errors handling.*/
if ((flags & WB32_DMAC_IT_ERR) != 0) {
if ((flags & WB32_DMAC_IT_STATE_ERR) != 0) {
/* DMA, this could help only if the DMA tries to access an unmapped
address space or violates alignment rules.*/
_adc_isr_error_code(adcp, ADC_ERR_DMAFAILURE);
}
else {
if ((flags & WB32_DMAC_IT_TFR) != 0) {
if ((flags & WB32_DMAC_IT_STATE_TFR) != 0) {
/* Transfer complete processing.*/
_adc_isr_full_code(adcp);
}
/* Because WB32 DMAC hasn't half transfer interrupt,
so it use transfer complete interrupt. */
else if ((flags & WB32_DMAC_IT_TFR) != 0) {
else if ((flags & WB32_DMAC_IT_STATE_BLOCK) != 0) {
/* Half transfer processing.*/
_adc_isr_half_code(adcp);
}
@ -104,7 +104,8 @@ void adc_lld_init(void) {
WB32_DMA_CHCFG_MSIZE_HWORD | \
WB32_DMA_CHCFG_DIR_P2M | \
WB32_DMA_CHCFG_MINC | \
WB32_DMA_CHCFG_CIRC;
WB32_DMA_CHCFG_TCIE | \
WB32_DMAC_INTERRUPT_EN;
/* Temporary activation.*/
rccEnableADC();
@ -227,7 +228,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
if (adcp->depth > 1) {
/* If circular buffer depth > 1, then the half transfer interrupt
is enabled in order to allow streaming processing.*/
mode |= WB32_DMA_CHCFG_TCIE;
mode |= WB32_DMA_CHCFG_HTIE;
}
}
dmaStreamSetDestination(adcp->dmastp, adcp->samples);
@ -264,7 +265,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
void adc_lld_stop_conversion(ADCDriver *adcp) {
dmaStreamDisable(adcp->dmastp);
adcp->adc->CR2 = 0;
rccResetADC();
}
#endif /* HAL_USE_ADC */

12
os/hal/ports/WB32/LLD/DMAv1/wb32_dma.c
View File

@ -425,7 +425,7 @@ void dmaServeInterrupt(const wb32_dma_stream_t *dmastp) {
uint32_t regaddr = ((uint32_t)(&((dmastp)->dmac->StatusTfr)) + WB32_DMAC_IT_TFR);
if ((*((__I uint32_t *)(regaddr))) & mask) {
IT_flag = WB32_DMAC_IT_TFR;
IT_flag = WB32_DMAC_IT_STATE_TFR;
if (dma.streams[selfindex].func) {
dma.streams[selfindex].func(dma.streams[selfindex].param, IT_flag);
}
@ -434,7 +434,7 @@ void dmaServeInterrupt(const wb32_dma_stream_t *dmastp) {
regaddr = ((uint32_t)(&((dmastp)->dmac->StatusTfr)) + WB32_DMAC_IT_BLOCK);
if ((*((__I uint32_t *)(regaddr))) & mask) {
IT_flag = WB32_DMAC_IT_BLOCK;
IT_flag = WB32_DMAC_IT_STATE_BLOCK;
if (dma.streams[selfindex].func) {
dma.streams[selfindex].func(dma.streams[selfindex].param, IT_flag);
}
@ -443,7 +443,7 @@ void dmaServeInterrupt(const wb32_dma_stream_t *dmastp) {
regaddr = ((uint32_t)(&((dmastp)->dmac->StatusTfr)) + WB32_DMAC_IT_SRCTRAN);
if ((*((__I uint32_t *)(regaddr))) & mask) {
IT_flag = WB32_DMAC_IT_SRCTRAN;
IT_flag = WB32_DMAC_IT_STATE_SRCTRAN;
if (dma.streams[selfindex].func) {
dma.streams[selfindex].func(dma.streams[selfindex].param, IT_flag);
}
@ -452,7 +452,7 @@ void dmaServeInterrupt(const wb32_dma_stream_t *dmastp) {
regaddr = ((uint32_t)(&((dmastp)->dmac->StatusTfr)) + WB32_DMAC_IT_DSTTRAN);
if ((*((__I uint32_t *)(regaddr))) & mask) {
IT_flag = WB32_DMAC_IT_DSTTRAN;
IT_flag = WB32_DMAC_IT_STATE_DSTTRAN;
if (dma.streams[selfindex].func) {
dma.streams[selfindex].func(dma.streams[selfindex].param, IT_flag);
}
@ -461,11 +461,13 @@ void dmaServeInterrupt(const wb32_dma_stream_t *dmastp) {
regaddr = ((uint32_t)(&((dmastp)->dmac->StatusTfr)) + WB32_DMAC_IT_ERR);
if ((*((__I uint32_t *)(regaddr))) & mask) {
IT_flag = WB32_DMAC_IT_ERR;
IT_flag = WB32_DMAC_IT_STATE_ERR;
if (dma.streams[selfindex].func) {
dma.streams[selfindex].func(dma.streams[selfindex].param, IT_flag);
}
}
dmaStreamClearInterrupt(dmastp);
}
#endif /* WB32_DMA_REQUIRED */

23
os/hal/ports/WB32/LLD/DMAv1/wb32_dma.h
View File

@ -322,6 +322,15 @@
#define WB32_DMAC_IT_SRCTRAN (0x2U << 3)
#define WB32_DMAC_IT_DSTTRAN (0x3U << 3)
#define WB32_DMAC_IT_ERR (0x4U << 3)
/** @defgroup DMAC_interrupts_states_definitions
* @{
*/
#define WB32_DMAC_IT_STATE_TFR (0x1U << 0)
#define WB32_DMAC_IT_STATE_BLOCK (0x1U << 1)
#define WB32_DMAC_IT_STATE_SRCTRAN (0x1U << 2)
#define WB32_DMAC_IT_STATE_DSTTRAN (0x1U << 3)
#define WB32_DMAC_IT_STATE_ERR (0x1U << 4)
/**
* @}
*/
@ -641,10 +650,14 @@ typedef struct {
(dmastp)->dmac->Ch[(dmastp)->channel].CFGL = (((mode) & WB32_DMA_CHCFG_PL_MASK) >> 8) | \
(((mode) & WB32_DMA_CHCFG_CIRC) << 24) | \
(((mode) & WB32_DMA_CHCFG_CIRC) << 25); \
if ((mode) & (WB32_DMA_CHCFG_TCIE | WB32_DMA_CHCFG_HTIE)) { \
if ((mode) & (WB32_DMA_CHCFG_TCIE)) { \
(dmastp)->dmac->Ch[(dmastp)->channel].CTLL |= WB32_DMAC_INTERRUPT_EN; \
dmaStreamEnableInterrupt(dmastp, WB32_DMAC_IT_TFR); \
} \
if ((mode) & (WB32_DMA_CHCFG_HTIE)) { \
(dmastp)->dmac->Ch[(dmastp)->channel].CTLL |= WB32_DMAC_INTERRUPT_EN; \
dmaStreamEnableInterrupt(dmastp, WB32_DMAC_IT_BLOCK); \
} \
if ((mode) & WB32_DMA_CHCFG_TEIE) { \
(dmastp)->dmac->Ch[(dmastp)->channel].CTLL |= WB32_DMAC_INTERRUPT_EN; \
dmaStreamEnableInterrupt(dmastp, WB32_DMAC_IT_ERR); \
@ -692,7 +705,7 @@ typedef struct {
#define dmaStreamEnableInterrupt(dmastp, it_flag) { \
uint32_t mask = (uint32_t)(0x01U << ((dmastp)->channel)); \
uint32_t regaddr = ((uint32_t)(&((dmastp)->dmac->MaskTfr)) + it_flag); \
*((__O uint32_t *)(regaddr)) = (mask << 8) | mask; \
*((__O uint32_t *)(regaddr)) |= (mask << 8) | mask; \
}
/**
@ -709,7 +722,7 @@ typedef struct {
#define dmaStreamDisableInterrupt(dmastp, it_flag) { \
uint32_t mask = (uint32_t)(0x01U << ((dmastp)->channel)); \
uint32_t regaddr = ((uint32_t)(&((dmastp)->dmac->MaskTfr)) + it_flag); \
*((__O uint32_t *)(regaddr)) = (mask << 8); \
*((__O uint32_t *)(regaddr)) &= ~(mask); \
}
/**
@ -784,7 +797,7 @@ typedef struct {
*/
#define dmaStreamEnable(dmastp) { \
uint32_t mask = (uint32_t)(0x01U << ((dmastp)->channel)); \
(dmastp)->dmac->ChEnReg = (mask << 8) | mask; \
(dmastp)->dmac->ChEnReg |= (mask << 8) | mask; \
}
/**
@ -803,7 +816,7 @@ typedef struct {
*/
#define dmaStreamDisable(dmastp) { \
uint32_t mask = (uint32_t)(0x01U << ((dmastp)->channel)); \
(dmastp)->dmac->ChEnReg = (mask << 8); \
(dmastp)->dmac->ChEnReg &= ~(mask); \
dmaStreamDisableInterruptAll(dmastp); \
dmaStreamClearInterrupt(dmastp); \
}